Merge tag 'upstream/3.0.5'

Upstream version 3.0.5

# gpg: Signature made Sun 19 Apr 2015 10:30:41 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 15 insertions, 2 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/common/signalwait.cpp b/SQLiteStudio3/coreSQLiteStudio/common/signalwait.cpp
index 90f9075..4a22e83 100644
--- a/SQLiteStudio3/coreSQLiteStudio/common/signalwait.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/common/signalwait.cpp
@@ -12,8 +12,11 @@ bool SignalWait::wait(int msTimeout)
 {
     QTime timer(0, 0, 0, msTimeout);
     timer.start();
-    while (!called && timer.elapsed() < msTimeout)
-        qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+    while (!called && !failed && timer.elapsed() < msTimeout)
+        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+
+    if (failed)
+        return false;
 
     return called;
 }
@@ -23,7 +26,17 @@ void SignalWait::reset()
     called = false;
 }
 
+void SignalWait::addFailSignal(QObject* object, const char* signal)
+{
+    connect(object, signal, this, SLOT(handleFailSignal()));
+}
+
 void SignalWait::handleSignal()
 {
     called = true;
 }
+
+void SignalWait::handleFailSignal()
+{
+    failed = true;
+}