Merge pull request #7495 from silverqx/options-save-state-cancel

Options dialog save windows state in destructor
This commit is contained in:
Mike Tzou 2017-09-26 15:30:17 +08:00 committed by GitHub
commit 796cd674d7

View file

@ -421,6 +421,9 @@ void OptionsDialog::initializeLanguageCombo()
OptionsDialog::~OptionsDialog() OptionsDialog::~OptionsDialog()
{ {
qDebug("-> destructing Options"); qDebug("-> destructing Options");
saveWindowState();
foreach (const QString &path, addedScanDirs) foreach (const QString &path, addedScanDirs)
ScanFoldersModel::instance()->removePath(path); ScanFoldersModel::instance()->removePath(path);
ScanFoldersModel::instance()->configure(); // reloads "removed" paths ScanFoldersModel::instance()->configure(); // reloads "removed" paths
@ -1211,7 +1214,7 @@ void OptionsDialog::on_buttonBox_accepted()
this->hide(); this->hide();
saveOptions(); saveOptions();
} }
saveWindowState();
accept(); accept();
} }