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, 9 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/populateworker.cpp b/SQLiteStudio3/coreSQLiteStudio/populateworker.cpp
index 0b08526..f25a6ac 100644
--- a/SQLiteStudio3/coreSQLiteStudio/populateworker.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/populateworker.cpp
@@ -46,6 +46,13 @@ void PopulateWorker::run()
         if (i == 0 && !beforePopulating())
             return;
 
+        if (isInterrupted())
+        {
+            db->rollback();
+            emit finished(false);
+            return;
+        }
+
         args.clear();
         for (PopulateEngine* engine : engines)
             args << engine->nextValue(nextValueError);
@@ -58,6 +65,8 @@ void PopulateWorker::run()
             emit finished(false);
             return;
         }
+
+        emit finishedStep(i + 1);
     }
 
     if (!db->commit())