Fix 1694393: save 'pref.*' keys first, so the window manager hint preference is loade...

[synfig.git] / synfig-studio / trunk / src / synfigapp / settings.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/settings.cpp b/synfig-studio/trunk/src/synfigapp/settings.cpp
index 53d3179..73d927f 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/settings.cpp
+++ b/synfig-studio/trunk/src/synfigapp/settings.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file template.cpp
+/*!    \file settings.cpp
 **     \brief Template File
 **
-**     $Id: settings.cpp,v 1.2 2005/01/12 04:08:32 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -129,6 +129,19 @@ Settings::set_value(const synfig::String& key,const synfig::String& value)
        return true;
 }
 
+//! Compare two key names, putting pref.* keys first
+static bool
+compare_pref_first (synfig::String first, synfig::String second)
+{
+       return  first.substr(0, 5) == "pref."
+                       ?       second.substr(0, 5) == "pref."
+                               ?       first < second
+                               :       true
+                       :       second.substr(0, 5) == "pref."
+                               ?       false
+                               :       first < second;
+}
+
 Settings::KeyList
 Settings::get_key_list()const
 {
@@ -154,7 +167,10 @@ Settings::get_key_list()const
        }
 
        // Sort the keys
-       key_list.sort();
+       // We make sure the 'pref.*' keys come first to fix bug 1694393,
+       // where windows were being created before the parameter
+       // specifying which window manager hint to use had been loaded
+       key_list.sort(compare_pref_first);
 
        return key_list;
 }