[Bugfix] Fix varArrayToNSArray and varObjectToNSDictionary handling o…

…f nested arrays var::isObject() returns true for array variants, so it must be tested after var::isArray()
juce-framework · Sep 24, 2023 · c957d69 · c957d69
1 parent 7727050
commit c957d69
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/modules/juce_core/native/juce_ObjCHelpers_mac.h b/modules/juce_core/native/juce_ObjCHelpers_mac.h
@@ -102,17 +102,17 @@ inline NSDictionary* varObjectToNSDictionary (const var& varToParse)
 
             const var& valueVar = properties.getValueAt (i);
 
-            if (valueVar.isObject())
+            if (valueVar.isArray())
             {
-                auto* valueDictionary = varObjectToNSDictionary (valueVar);
+                auto* valueArray = varArrayToNSArray (valueVar);
 
-                [dictionary setObject: valueDictionary forKey: keyString];
+                [dictionary setObject: valueArray forKey: keyString];
             }
-            else if (valueVar.isArray())
+            else if (valueVar.isObject())
             {
-                auto* valueArray = varArrayToNSArray (valueVar);
+                auto* valueDictionary = varObjectToNSDictionary (valueVar);
 
-                [dictionary setObject: valueArray forKey: keyString];
+                [dictionary setObject: valueDictionary forKey: keyString];
             }
             else
             {
@@ -139,17 +139,17 @@ inline NSArray* varArrayToNSArray (const var& varToParse)
 
     for (const auto& aVar : *varArray)
     {
-        if (aVar.isObject())
+        if (aVar.isArray())
         {
-            auto* valueDictionary = varObjectToNSDictionary (aVar);
+            auto* valueArray = varArrayToNSArray (aVar);
 
-            [array addObject: valueDictionary];
+            [array addObject: valueArray];
         }
-        else if (aVar.isArray())
+        else if (aVar.isObject())
         {
-            auto* valueArray = varArrayToNSArray (aVar);
+            auto* valueDictionary = varObjectToNSDictionary (aVar);
 
-            [array addObject: valueArray];
+            [array addObject: valueDictionary];
         }
         else
         {