Fix naming of nested Enums with short names

2 files changed, 12 insertions, 0 deletions

diff --git a/tests/options.expected b/tests/options.expected
index 61d9805e..93501430 100644
--- a/tests/options.expected
+++ b/tests/options.expected
@@ -3,3 +3,4 @@ char msgsize\[30\];
 char fieldsize\[40\];
 pb_callback_t int32_callback;
 \sEnumValue1 = 1
+Message5_EnumValue1
diff --git a/tests/options.proto b/tests/options.proto
index 7eb2eb30..413d21b5 100644
--- a/tests/options.proto
+++ b/tests/options.proto
@@ -43,3 +43,14 @@ message EnumTest
 {
     required Enum1 field = 1 [default = EnumValue2];
 }
+
+// Short enum names inside message
+message Message5
+{
+    enum Enum2
+    {
+       option (nanopb_enumopt).long_names = false;
+       EnumValue1 = 1;
+    }
+    required Enum2 field = 1 [default = EnumValue1];
+}