comparison main/MainWindow.cpp @ 1861:8c4df1f3fef7

Merge from branch plugin-path-config
author Chris Cannam
date Mon, 11 Jun 2018 14:42:56 +0100
parents e5229958a10c
children dc275d7d9aa6 4e43b07eb84d
comparison
equal deleted inserted replaced
1849:4af1e71eaa3f 1861:8c4df1f3fef7
3542 } 3542 }
3543 settings.endGroup(); 3543 settings.endGroup();
3544 3544
3545 if (m_preferencesDialog && 3545 if (m_preferencesDialog &&
3546 m_preferencesDialog->isVisible()) { 3546 m_preferencesDialog->isVisible()) {
3547 closeSession(); // otherwise we'll have to wait for prefs changes
3548 m_preferencesDialog->applicationClosing(true); 3547 m_preferencesDialog->applicationClosing(true);
3549 } 3548 }
3550 3549
3551 closeSession(); 3550 closeSession();
3552 3551