Tray: Show settings dialog on click if it's not active

Before, you often had to click twice to bring the window
to the front, because the first click would close it.
This commit is contained in:
Christian Kamm 2015-11-10 12:33:36 +01:00
parent 9955b0756a
commit 4b5c3d8f09

View file

@ -150,7 +150,7 @@ void ownCloudGui::slotOpenSettingsDialog()
{ {
// if account is set up, start the configuration wizard. // if account is set up, start the configuration wizard.
if( !AccountManager::instance()->accounts().isEmpty() ) { if( !AccountManager::instance()->accounts().isEmpty() ) {
if (_settingsDialog.isNull() || !_settingsDialog->isVisible()) { if (_settingsDialog.isNull() || QApplication::activeWindow() != _settingsDialog) {
slotShowSettings(); slotShowSettings();
} else { } else {
_settingsDialog->close(); _settingsDialog->close();