mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-24 09:49:42 +01:00
Code Issues Releases Wiki Activity

* Only allow one settings dialog at a time.

Browse Source
This commit is contained in:
Christian Muehlhaeuser 2014-10-03 05:26:01 +02:00
parent 025d152936
commit b99692729c
2 changed files with 10 additions and 4 deletions

11
src/tomahawk/TomahawkWindow.cpp

@ -1000,10 +1000,15 @@ TomahawkWindow::onHistoryForwardAvailable( bool avail )
void
TomahawkWindow::showSettingsDialog()
{
SettingsDialog* settingsDialog = new SettingsDialog;
connect( settingsDialog, SIGNAL( finished( bool ) ), settingsDialog, SLOT( deleteLater() ) );
if ( m_settingsDialog )
return;
settingsDialog->show();
m_settingsDialog = new SettingsDialog;
// This needs to be a QueuedConnection, so that deleteLater() actually works.
connect( m_settingsDialog.data(), SIGNAL( finished( bool ) ),
m_settingsDialog.data(), SLOT( deleteLater() ), Qt::QueuedConnection );
m_settingsDialog->show();
}

3
src/tomahawk/TomahawkWindow.h

@ -56,12 +56,12 @@ class QSearchField;
class SourceTreeView;
class QAction;
class SettingsDialog;
class MusicScanner;
class AudioControls;
class TomahawkTrayIcon;
class PlaylistModel;
class AnimatedSplitter;
class AccountsToolButton;
namespace Ui
@ -179,6 +179,7 @@ private:
#endif
Ui::TomahawkWindow* ui;
QPointer<SettingsDialog> m_settingsDialog;
QSearchField* m_searchWidget;
AudioControls* m_audioControls;
TomahawkTrayIcon* m_trayIcon;