From 76c758e8f46567c20689e6e666c4a3aa32c17dbc Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 14 Dec 2013 17:50:55 +0000 Subject: fixed regression git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3961 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/playlistmanager.cpp | 2 +- src/qmmpui/qmmpuisettings.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/qmmpui') diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp index 1a7e8a382..c8ce69e4b 100644 --- a/src/qmmpui/playlistmanager.cpp +++ b/src/qmmpui/playlistmanager.cpp @@ -35,7 +35,7 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent) if(m_instance) qFatal("PlayListManager: only one instance is allowed"); m_instance = this; - m_ui_settings = new QmmpUiSettings(this); + m_ui_settings = QmmpUiSettings::instance(); m_current = 0; m_selected = 0; m_timer = new QTimer(this); diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp index 46be8610c..a05c811ee 100644 --- a/src/qmmpui/qmmpuisettings.cpp +++ b/src/qmmpui/qmmpuisettings.cpp @@ -28,6 +28,8 @@ QmmpUiSettings *QmmpUiSettings::m_instance = 0; QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent) { + if(m_instance) + qFatal("QmmpUiSettings: only one instance is allowed"); m_instance = this; QSettings s (Qmmp::configFile(), QSettings::IniFormat); s.beginGroup("PlayList"); -- cgit v1.2.3-13-gbd6f