comparison main/MainWindow.cpp @ 625:763b1fbeb31c with-dependencies

Merge from the default branch
author Chris Cannam
date Tue, 24 Sep 2013 11:06:29 +0100
parents c0a20cd1a9ff
children 2484381b53a1
comparison
equal deleted inserted replaced
623:d4d2f9319155 625:763b1fbeb31c
3092 return; 3092 return;
3093 } 3093 }
3094 3094
3095 QSettings settings; 3095 QSettings settings;
3096 settings.beginGroup("MainWindow"); 3096 settings.beginGroup("MainWindow");
3097 settings.setValue("size", size()); 3097 settings.setValue("maximised", isMaximized());
3098 settings.setValue("position", pos()); 3098 if (!isMaximized()) {
3099 settings.setValue("size", size());
3100 settings.setValue("position", pos());
3101 }
3099 settings.endGroup(); 3102 settings.endGroup();
3100 3103
3101 if (m_preferencesDialog && 3104 if (m_preferencesDialog &&
3102 m_preferencesDialog->isVisible()) { 3105 m_preferencesDialog->isVisible()) {
3103 closeSession(); // otherwise we'll have to wait for prefs changes 3106 closeSession(); // otherwise we'll have to wait for prefs changes