Browse Source

Fixed shared toolbar

Krzysztof Krysiński 3 years ago
parent
commit
7537d35bc3
1 changed files with 6 additions and 2 deletions
  1. 6 2
      PixiEditor/ViewModels/SubViewModels/Main/ToolsViewModel.cs

+ 6 - 2
PixiEditor/ViewModels/SubViewModels/Main/ToolsViewModel.cs

@@ -94,10 +94,14 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
         public void SetActiveTool(Tool tool)
         {
             MoveToolIsTransient = false;
+            bool shareToolbar = IPreferences.Current.GetPreference<bool>("EnableSharedToolbar");
             if (ActiveTool != null)
             {
                 activeTool.IsActive = false;
-                ActiveTool.Toolbar.SaveToolbarSettings();
+                if (shareToolbar)
+                {
+                    ActiveTool.Toolbar.SaveToolbarSettings();
+                }
             }
 
             LastActionTool = ActiveTool;
@@ -105,7 +109,7 @@ namespace PixiEditor.ViewModels.SubViewModels.Main
 
             ActiveTool = tool;
 
-            if (IPreferences.Current.GetPreference<bool>("EnableSharedToolbar"))
+            if (shareToolbar)
             {
                 ActiveTool.Toolbar.LoadSharedSettings();
             }