Changeset 116 for smplayer/trunk/src

Timestamp:

Dec 14, 2011, 2:31:02 PM (14 years ago)

Author:

Silvan Scherrer

Message:

smplayer: prevent some gui hang

Location:

smplayer/trunk/src

Files:

• core.cpp (modified) (3 diffs)
• debug (deleted)
• release (deleted)

smplayer/trunk/src/core.cpp

@@ -22 +22 @@
 #include <QRegExp>
 #include <QTextStream>
+#include <QEventLoop>
 
 #include <cmath>
@@ -2227 +2228 @@
         }
 
+#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");
     
@@ -2234 +2250 @@
                 proc->kill();
         }
+#endif
 
         qDebug("Core::stopMplayer: Finished. (I hope)");