diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-09-18 10:21:47 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-09-18 10:21:47 +0000 |
| commit | 42aa3971c31736f04f668f84884c05f4dad793bd (patch) | |
| tree | a7fd0e172e928f0532d625c1540f36c1d0dc5a1e /src/ui/mainwindow.cpp | |
| parent | 758badf800f49c7db3ca2ee81afd1e885ae97da5 (diff) | |
| download | qmmp-42aa3971c31736f04f668f84884c05f4dad793bd.tar.gz qmmp-42aa3971c31736f04f668f84884c05f4dad793bd.tar.bz2 qmmp-42aa3971c31736f04f668f84884c05f4dad793bd.zip | |
fixed incorrect behaviour with command line, updated linguist files
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1891 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui/mainwindow.cpp')
| -rw-r--r-- | src/ui/mainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 1af3184e0..99cbc0ae2 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -550,14 +550,14 @@ void MainWindow::savePlaylist() void MainWindow::setFileList(const QStringList & l) { if (m_core->state() == Qmmp::Playing || m_core->state() == Qmmp::Paused) + { stop(); - qApp->processEvents(); //receive stop signal + qApp->processEvents(); //receive stop signal + } + m_pl_manager->activatePlayList(m_pl_manager->selectedPlayList()); connect(m_pl_manager->selectedPlayList(), SIGNAL(firstAdded()), this, SLOT(play())); if (m_pl_manager->selectedPlayList()->setFileList(l)) - { - m_pl_manager->activatePlayList(m_pl_manager->selectedPlayList()); m_model = m_pl_manager->selectedPlayList(); - } else { disconnect(m_pl_manager->selectedPlayList(), SIGNAL(firstAdded()), this, SLOT(play())); |
