From d894be75f42dead336c4ac591d98ff1b91474368 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 5 Sep 2016 06:09:31 +0000 Subject: 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 --- src/qmmpui/playlistmanager.cpp | 2 ++ src/qmmpui/playlistmodel.cpp | 5 +++++ src/qmmpui/playlistmodel.h | 4 ++++ 3 files changed, 11 insertions(+) (limited to 'src') 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 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 @@ -127,6 +127,10 @@ public: * Returns number of tracks. */ int trackCount() const; + /*! + * Returns \b true if the model contains no tracks; otherwise returns \b false. + */ + bool isEmpty() const; /*! * Returns number of columns. */ -- cgit v1.2.3-13-gbd6f