# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1618363620 0
# Node ID ddc6d49d11102b373ce83443af3b077c3742e9c8
# Parent  689261c29745674acf504872f2737882032d0aff
iOS: Reorganize the code so retval doesn't get clobbered without the
returns.

diff -r 689261c29745 -r ddc6d49d1110 ios/dw.m
--- a/ios/dw.m	Tue Apr 13 22:05:46 2021 +0000
+++ b/ios/dw.m	Wed Apr 14 01:27:00 2021 +0000
@@ -1236,10 +1236,10 @@
 -(void)getUserInterfaceStyle:(id)param
 {
     NSMutableArray *array = param;
-    UIUserInterfaceStyle style = [hiddenWindow overrideUserInterfaceStyle];
+    UIUserInterfaceStyle overridestyle = [hiddenWindow overrideUserInterfaceStyle];
     int retval;
     
-    switch(style)
+    switch(overridestyle)
     {
         case UIUserInterfaceStyleLight:
             retval = DW_DARK_MODE_DISABLED;
@@ -1248,19 +1248,22 @@
             retval = DW_DARK_MODE_FORCED;
             break;
         default:  /* UIUserInterfaceStyleUnspecified */
-            style = [[[hiddenWindow rootViewController] traitCollection] userInterfaceStyle];
-    }
-    switch(style)
-    {
-        case UIUserInterfaceStyleLight:
-            retval = DW_DARK_MODE_BASIC;
-            break;
-        case UIUserInterfaceStyleDark:
-            retval = DW_DARK_MODE_FULL;
-            break;
-        default: /* UIUserInterfaceStyleUnspecified */
-            retval = DW_FEATURE_UNSUPPORTED;
-            break;
+        {
+            UIUserInterfaceStyle style = [[[hiddenWindow rootViewController] traitCollection] userInterfaceStyle];
+
+            switch(style)
+            {
+                case UIUserInterfaceStyleLight:
+                    retval = DW_DARK_MODE_BASIC;
+                    break;
+                case UIUserInterfaceStyleDark:
+                    retval = DW_DARK_MODE_FULL;
+                    break;
+                default: /* UIUserInterfaceStyleUnspecified */
+                    retval = DW_FEATURE_UNSUPPORTED;
+                    break;
+            }
+        }
     }
     [array addObject:[NSNumber numberWithInt:retval]];
 }