Merge tag 'upstream/3.0.7'

Upstream version 3.0.7

# gpg: Signature made Wed 25 Nov 2015 04:48:48 PM EST 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, 5 insertions, 2 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp b/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp
index 076894a..4b0628b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp
@@ -40,6 +40,9 @@ SqlEditor::SqlEditor(QWidget *parent) :
 
 SqlEditor::~SqlEditor()
 {
+    if (objectsInNamedDbFuture.isRunning())
+        objectsInNamedDbFuture.waitForFinished();
+
     if (queryParser)
     {
         delete queryParser;
@@ -515,7 +518,7 @@ void SqlEditor::refreshValidObjects()
     if (!db || !db->isValid())
         return;
 
-    QtConcurrent::run([this]()
+    objectsInNamedDbFuture = QtConcurrent::run([this]()
     {
         QMutexLocker lock(&objectsInNamedDbMutex);
         objectsInNamedDb.clear();
@@ -526,7 +529,7 @@ void SqlEditor::refreshValidObjects()
         QStringList objects;
         foreach (const QString& dbName, databases)
         {
-            objects = resolver.getAllObjects();
+            objects = resolver.getAllObjects(dbName);
             objectsInNamedDb[dbName] << objects;
         }
     });