aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-09-05 06:09:31 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-09-05 06:09:31 +0000
commitd894be75f42dead336c4ac591d98ff1b91474368 (patch)
tree253c2b063b1806878eec78a933e2958dc1d9d558 /src
parent51e432cbb803745f905ca39c96834a3e5bdf52c0 (diff)
downloadqmmp-d894be75f42dead336c4ac591d98ff1b91474368.tar.gz
qmmp-d894be75f42dead336c4ac591d98ff1b91474368.tar.bz2
qmmp-d894be75f42dead336c4ac591d98ff1b91474368.zip
fixed 'index out of range' warning
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6710 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
-rw-r--r--src/qmmpui/playlistmanager.cpp2
-rw-r--r--src/qmmpui/playlistmodel.cpp5
-rw-r--r--src/qmmpui/playlistmodel.h4
3 files changed, 11 insertions, 0 deletions
diff --git a/src/qmmpui/playlistmanager.cpp b/src/qmmpui/playlistmanager.cpp
index 26a3c828c..524a7e2fd 100644
--- a/src/qmmpui/playlistmanager.cpp
+++ b/src/qmmpui/playlistmanager.cpp
@@ -338,6 +338,8 @@ void PlayListManager::writePlayLists()
tmpFile.write(QString("current_playlist=%1\n").arg(m_models.indexOf(m_current)).toUtf8());
foreach(PlayListModel *model, m_models)
{
+ if(model->isEmpty())
+ continue;
QList<PlayListItem *> items = model->items();
tmpFile.write(QString("playlist=%1\n").arg(model->name()).toUtf8());
tmpFile.write(QString("current=%1\n").arg(model->indexOfTrack(model->currentIndex())).toUtf8());
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index bc0d057a8..dd4cec525 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -276,6 +276,11 @@ int PlayListModel::trackCount() const
return m_container->trackCount();
}
+bool PlayListModel::isEmpty() const
+{
+ return m_container->isEmpty();
+}
+
int PlayListModel::columnCount() const
{
return MetaDataHelper::instance()->columnCount();
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 7fa6753c9..68ecaee16 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -128,6 +128,10 @@ public:
*/
int trackCount() const;
/*!
+ * Returns \b true if the model contains no tracks; otherwise returns \b false.
+ */
+ bool isEmpty() const;
+ /*!
* Returns number of columns.
*/
int columnCount() const;