From 8351bd6fbf8b9b6b3360a0cfd6546127794d0b89 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 10 Dec 2013 14:53:53 +0000 Subject: do not read playlist settings twice git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3959 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/playlistmanager.cpp | 13 +++++++++---- src/qmmpui/playlistmanager.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp index dbeeed16e..a49698a6e 100644 --- a/src/qmmpui/playlistmanager.cpp +++ b/src/qmmpui/playlistmanager.cpp @@ -41,6 +41,7 @@ PlayListManager::PlayListManager(QObject *parent) : QObject(parent) m_shuffle = false; m_autosave_playlist = false; m_groups_enabled = false; + m_update = false; m_timer = new QTimer(this); m_timer->setInterval(5000); m_timer->setSingleShot(true); @@ -516,10 +517,14 @@ void PlayListManager::setGroupsEnabled(bool enabled) void PlayListManager::readSettings() { - QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - setRepeatableList(settings.value("Playlist/repeatable",false).toBool()); - setShuffle(settings.value("Playlist/shuffle",false).toBool()); - setGroupsEnabled(settings.value("Playlist/groups",false).toBool()); + if(!m_update) + { + m_update = true; + QSettings settings(Qmmp::configFile(), QSettings::IniFormat); + setRepeatableList(settings.value("Playlist/repeatable",false).toBool()); + setShuffle(settings.value("Playlist/shuffle",false).toBool()); + setGroupsEnabled(settings.value("Playlist/groups",false).toBool()); + } QmmpUiSettings *ui_settings = QmmpUiSettings::instance(); if (m_autosave_playlist != ui_settings->autoSavePlayList()) diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h index c6769e4fd..dce8ba8bf 100644 --- a/src/qmmpui/playlistmanager.h +++ b/src/qmmpui/playlistmanager.h @@ -288,6 +288,7 @@ private: bool m_repeatable, m_shuffle, m_autosave_playlist; bool m_groups_enabled; QTimer *m_timer; + bool m_update; }; #endif // PLAYLISTMANAGER_H -- cgit v1.2.3-13-gbd6f