aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Engines
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-04-10 20:50:28 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-04-10 20:50:28 +0000
commitd797b6af7c3d86cffd26ff8a1d4844dc5cc730b5 (patch)
treee9609cb08d6953c18be48bb3d7592c36c7ae5e8b /src/plugins/Engines
parentde2cf5e954ce3a1166deede76a539446f85a9e08 (diff)
downloadqmmp-d797b6af7c3d86cffd26ff8a1d4844dc5cc730b5.tar.gz
qmmp-d797b6af7c3d86cffd26ff8a1d4844dc5cc730b5.tar.bz2
qmmp-d797b6af7c3d86cffd26ff8a1d4844dc5cc730b5.zip
fixed regression, fixed signals synchronization (Fixes issue 447), fixed
mplayer engine bugs git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2152 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Engines')
-rw-r--r--src/plugins/Engines/mplayer/mplayerengine.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp
index 39aaa5401..7471cc6cd 100644
--- a/src/plugins/Engines/mplayer/mplayerengine.cpp
+++ b/src/plugins/Engines/mplayer/mplayerengine.cpp
@@ -167,14 +167,11 @@ void MplayerEngine::seek(qint64 pos)
void MplayerEngine::stop()
{
- if (m_process->state() == QProcess::Running)
- {
- m_process->write("quit\n");
- m_process->waitForFinished(1500);
- }
- StateHandler::instance()->dispatch(Qmmp::Stopped);
while(!m_sources.isEmpty())
m_sources.dequeue()->deleteLater();
+ m_process->write("quit\n");
+ m_process->close();
+ StateHandler::instance()->dispatch(Qmmp::Stopped);
}
void MplayerEngine::pause()