Fix main window restore if was maximized

FlaxEngine · Dec 18, 2018 · 588c22c · 588c22c
1 parent f51c650
commit 588c22c
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/FlaxEditor/Modules/WindowsModule.cs b/FlaxEditor/Modules/WindowsModule.cs
@@ -279,19 +279,23 @@ public bool LoadLayout(string path)
                         if (bounds.X < virtualDesktopSafeLeftCorner.X || bounds.Y < virtualDesktopSafeLeftCorner.Y || bounds.X > virtualDesktopSafeRightCorner.X || bounds.Y > virtualDesktopSafeRightCorner.Y)
                             bounds.Location = virtualDesktopSafeLeftCorner;
 
-                        if (Mathf.Min(bounds.Size.X, bounds.Size.Y) >= 1)
-                        {
-                            MainWindow.ClientBounds = bounds;
-                        }
-                        else
+                        if (isMaximized)
                         {
                             MainWindow.ClientPosition = bounds.Location;
-                        }
 
-                        if (isMaximized)
-                        {
                             MainWindow.Maximize();
                         }
+                        else
+                        {
+                            if (Mathf.Min(bounds.Size.X, bounds.Size.Y) >= 1)
+                            {
+                                MainWindow.ClientBounds = bounds;
+                            }
+                            else
+                            {
+                                MainWindow.ClientPosition = bounds.Location;
+                            }
+                        }
                     }
 
                     // Load master panel structure