aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-12-14 17:50:55 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-12-14 17:50:55 +0000
commit76c758e8f46567c20689e6e666c4a3aa32c17dbc (patch)
tree97fcb6e36ba81a516906787fce2480156e20f52b
parent92f1159a134f4d9dbd93176107afc48e4f77cb81 (diff)
downloadqmmp-76c758e8f46567c20689e6e666c4a3aa32c17dbc.tar.gz
qmmp-76c758e8f46567c20689e6e666c4a3aa32c17dbc.tar.bz2
qmmp-76c758e8f46567c20689e6e666c4a3aa32c17dbc.zip
fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3961 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/qmmpui/playlistmanager.cpp2
-rw-r--r--src/qmmpui/qmmpuisettings.cpp2
2 files changed, 3 insertions, 1 deletions
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");