1 files changed, 7 insertions, 8 deletions
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
index d22d1ed..8a74c7b 100644
--- a/src/corelib/io/qprocess_symbian.cpp
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -961,16 +961,15 @@ bool QProcessPrivate::waitForFinished(int msecs)
             User::WaitForRequest(logonStatus, timerStatus);
             QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished() - Wait completed");
 
-            if (timerStatus == KErrNone)
+            if (logonStatus != KRequestPending) {
+                timer.Cancel();
+                User::WaitForRequest(timerStatus);
+            } else {
                 timeoutOccurred = true;
-
-            timer.Cancel();
+                symbianProcess->LogonCancel(logonStatus);
+                User::WaitForRequest(logonStatus);
+            }
             timer.Close();
-
-            symbianProcess->LogonCancel(logonStatus);
-
-            // Eat cancel request completion so that it won't mess up main thread scheduling later
-            User::WaitForRequest(logonStatus, timerStatus);
         }
     } else {
         QPROCESS_DEBUG_PRINT("QProcessPrivate::waitForFinished(), qt_rprocess_running returned false");