fixed saving window state. again.

2 files changed, 8 insertions, 11 deletions

diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index ba4d2487..16b91d17 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -968,8 +968,8 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
 
       changeConfig(false);
       QSettings settings("MusE", "MusE-qt");
-      //restoreGeometry(settings.value("MusE/geometry").toByteArray());
-      restoreState(settings.value("MusE/windowState").toByteArray());
+      restoreGeometry(settings.value("MusE/geometry").toByteArray());
+      //restoreState(settings.value("MusE/windowState").toByteArray());
 
       song->update();
       
@@ -1469,8 +1469,10 @@ void MusE::closeEvent(QCloseEvent* event)
             }
 
       QSettings settings("MusE", "MusE-qt");
-      //settings.setValue("MusE/geometry", saveGeometry());
-      settings.setValue("MusE/windowState", saveState());
+      settings.setValue("MusE/geometry", saveGeometry());
+      //settings.setValue("MusE/windowState", saveState());
+      
+      writeGlobalConfiguration();
 
       // save "Open Recent" list
       QString prjPath(configPath);
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index d674d81d..1e86e1e0 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -4439,7 +4439,6 @@ void staff_t::update_part_indices()
 
 /* BUGS and potential bugs
  *   o THIS SHOULD NEVER HAPPEN: could not split note (found by tim)
- *   o when un-mdi-fying, toolbar state gets broken
  * 
  *   o tied notes don't work properly when there's a key-change in
  *     between, for example, when a cis is tied to a des
@@ -4451,15 +4450,11 @@ void staff_t::update_part_indices()
  *     changing "share" status, the changed state isn't stored
  * 
  * CURRENT TODO
- *   o save toolstate also when changing share/don't share
  *   o remove that ugly "bool initalizing" stuff. it's probably unneeded (watch out for the FINDMICH message)
- *   o shortcuts for "pencil" etc don't work when only mdiwin has focus and not the mainwin inside
- *   o implement borland-style maximize: free windows do not cover the main menu, even when maximized
  *   o mirror most menus to an additional right-click context menu to avoid the long mouse pointer
  *     journey to the menu bar. try to find a way which does not involve duplicate code!
- *   o fix arranger config loading: problem: first arranger is displayed and inited from garbage, then
- *     the real config is loaded :/
- *   o restoreState(settings.value("MusE/windowState").toByteArray()); in app.cpp: unneccessary?
+ *   o shortcuts for "pencil" etc don't work when only mdiwin has focus and not the mainwin inside
+ *   o implement borland-style maximize: free windows do not cover the main menu, even when maximized
  * 
  * IMPORTANT TODO
  *   o redo transport menu: offer "one beat" and "one bar" steps