Ticket #264: core.diff

core.cpp

@@ -21 +21 @@
 #include <QFileInfo>
 #include <QRegExp>
 #include <QTextStream>
+#include <QEventLoop>
 
 #include <cmath>
 
@@ -2226 +2227 @@
                 return;
         }
 
+#ifdef Q_OS_OS2
+        QEventLoop eventLoop;
+
+        connect(proc, SIGNAL(processExited()), &eventLoop, SLOT(quit()));
+
+        tellmp("quit");
+
+        QTimer::singleShot(5000, &eventLoop, SLOT(quit()));
+        eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
+
+        if (proc->isRunning()) {
+                qWarning("Core::stopMplayer: process didn't finish. Killing it...");
+                proc->kill();
+        }
+#else
     tellmp("quit");
     
         qDebug("Core::stopMplayer: Waiting mplayer to finish...");
@@ -2233 +2249 @@
                 qWarning("Core::stopMplayer: process didn't finish. Killing it...");
                 proc->kill();
         }
+#endif
 
         qDebug("Core::stopMplayer: Finished. (I hope)");
 }