Fix Build Settings changes not being saved immediately

sttz · Oct 21, 2019 · 6defb55 · 6defb55
1 parent 4da0eac
commit 6defb55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Editor/ProfileEditor.cs b/Editor/ProfileEditor.cs
@@ -601,14 +601,13 @@ protected void ResurseOptionsGUI(bool showBuild = false)
         optionAvailable = true;
         buildCategory = showBuild;
 
-        Option.changed = false;
-
         foreach (var option in options) {
             OptionGUIRecursive(option);
         }
 
         if (Option.changed) {
             FlushProfile();
+            Option.changed = false;
         }
     }
 

diff --git a/Options/OptionBuildSettings.cs b/Options/OptionBuildSettings.cs
@@ -124,8 +124,6 @@ public override bool EditGUI()
             Array.Sort(optionNames, optionFlags);
         }
 
-        EditorGUI.BeginChangeCheck();
-
         string name = "Multiple...";
 
         // Unity defines some deprecated flags as 0 as well (e.g. 
@@ -146,6 +144,7 @@ public override bool EditGUI()
             var menu = new GenericMenu();
             menu.AddItem(new GUIContent("Clear Options"), false, () => {
                 Value = 0;
+                Option.changed = true;
             });
             menu.AddSeparator("");
             for (int i = 0; i < optionFlags.Length && i < optionNames.Length; i++) {
@@ -154,12 +153,15 @@ public override bool EditGUI()
                 var selected = (Value & flag) == flag;
                 menu.AddItem(new GUIContent(optionNames[i]), selected, () => {
                     Value ^= flag;
+                    Option.changed = true;
                 });
             }
             menu.ShowAsContext();
         }
 
-        return EditorGUI.EndChangeCheck();
+        // The value is changed in the GenericMenu callbacks,
+        // which set Option.changed to true manually instead of returning true here.
+        return false;
     }
 }