[aseprite] 05/196: Fix problem setting default screen scaling factor on non-Windows platforms

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 1d7184dd37461d2cc163a0a87eb7593f26e68714
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Feb 29 22:21:59 2016 -0300

    Fix problem setting default screen scaling factor on non-Windows platforms
---
 src/app/modules/gui.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/modules/gui.cpp b/src/app/modules/gui.cpp
index e80cbca..cefa0bb 100644
--- a/src/app/modules/gui.cpp
+++ b/src/app/modules/gui.cpp
@@ -134,15 +134,17 @@ static bool create_main_display(bool gpuAccel,
     }
   }
 
-  if (main_display && !windowLayout.empty()) {
+  if (main_display) {
     // Change the scale value only in the first run (this will be
     // saved when the program is closed).
     if (scale == 0)
       Preferences::instance().general.screenScale(main_display->scale());
 
-    main_display->setLayout(windowLayout);
-    if (main_display->isMinimized())
-      main_display->maximize();
+    if (!windowLayout.empty()) {
+      main_display->setLayout(windowLayout);
+      if (main_display->isMinimized())
+        main_display->maximize();
+    }
   }
 
   return (main_display != nullptr);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git