diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-11-16 10:30:10 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-11-16 10:30:10 +0000 |
| commit | a6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0 (patch) | |
| tree | 738a3041eb49d8426ba37ede257dfe4cf27770a5 /src/ui/mainwindow.cpp | |
| parent | 8cd81045d9c56d2c3ec3c21d794d1ba65bbf6c8d (diff) | |
| download | qmmp-a6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0.tar.gz qmmp-a6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0.tar.bz2 qmmp-a6c5ce46f9ceb52a2b6275c49faaacc1de8c63d0.zip | |
fixed command line regression (Closes issue 194)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1380 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui/mainwindow.cpp')
| -rw-r--r-- | src/ui/mainwindow.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 7bfeea4c1..1080bec23 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -57,7 +57,6 @@ MainWindow::MainWindow(const QStringList& args, BuiltinCommandLineOption* option { m_vis = 0; m_update = FALSE; - m_paused = FALSE; m_option_manager = option_manager; setWindowIcon(QIcon(":/32x32/qmmp.png")); #if QT_VERSION >= 0x040500 @@ -204,7 +203,11 @@ void MainWindow::updateEQ() void MainWindow::showState(Qmmp::State state) { - //disconnect(m_playListModel, SIGNAL(firstAdded()), this, SLOT(play())); + if(m_model) + { + disconnect(m_model, SIGNAL(firstAdded()), this, 0); + m_model = 0; + } switch ((int) state) { case Qmmp::Playing: @@ -498,12 +501,17 @@ void MainWindow::setFileList(const QStringList & l) if (m_core->state() == Qmmp::Playing || m_core->state() == Qmmp::Paused) stop(); qApp->processEvents(); //receive stop signal - //connect(m_playListModel, SIGNAL(firstAdded()), this, SLOT(play())); - /*if (!m_playListModel->setFileList(l)) + 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_playListModel, SIGNAL(firstAdded()), this, SLOT(play())); + disconnect(m_pl_manager->selectedPlayList(), SIGNAL(firstAdded()), this, SLOT(play())); addFile(); - }*/ + } } void MainWindow::playPause() |