1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-21 00:12:06 +02:00

* Re-init SettingsDialog each time we show it (and delete it afterwards).

This commit is contained in:
Christian Muehlhaeuser 2013-09-03 22:38:25 +02:00
parent e88252880f
commit b9671f70a6
2 changed files with 3 additions and 6 deletions

View File

@ -112,7 +112,6 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
, ui( new Ui::TomahawkWindow )
, m_searchWidget( 0 )
, m_trayIcon( new TomahawkTrayIcon( this ) )
, m_settingsDialog( 0 )
, m_audioRetryCounter( 0 )
{
TomahawkStyle::loadFonts();
@ -836,10 +835,10 @@ TomahawkWindow::onHistoryForwardAvailable( bool avail )
void
TomahawkWindow::showSettingsDialog()
{
if ( !m_settingsDialog )
m_settingsDialog = new SettingsDialog;
SettingsDialog* settingsDialog = new SettingsDialog;
connect( settingsDialog, SIGNAL( finished( bool ) ), settingsDialog, SLOT( deleteLater() ) );
m_settingsDialog->show();
settingsDialog->show();
}

View File

@ -39,7 +39,6 @@
#include <shobjidl.h>
#endif
class SettingsDialog;
namespace Tomahawk
{
namespace Accounts
@ -181,7 +180,6 @@ private:
QueueView* m_queueView;
AnimatedSplitter* m_sidebar;
JobStatusSortModel* m_jobsModel;
SettingsDialog* m_settingsDialog;
// Menus and menu actions: Accounts menu
QMenuBar *m_menuBar;