mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tomahawk/TomahawkWindow.cpp
View File

@@ -1000,10 +1000,15 @@ TomahawkWindow::onHistoryForwardAvailable( bool avail )
void void
TomahawkWindow::showSettingsDialog() TomahawkWindow::showSettingsDialog()
{ {
SettingsDialog* settingsDialog = new SettingsDialog; if ( m_settingsDialog )
connect( settingsDialog, SIGNAL( finished( bool ) ), settingsDialog, SLOT( deleteLater() ) ); 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
View File

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