Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 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>"

2 files changed, 10 insertions, 8 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
index 52b0c7b..755c9b0 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
@@ -14,7 +14,7 @@
    <bool>false</bool>
   </property>
   <property name="features">
-   <set>QDockWidget::AllDockWidgetFeatures</set>
+   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
   </property>
   <property name="allowedAreas">
    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
index 281510f..a4e736f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
@@ -222,15 +222,16 @@ void DbTreeModel::restoreGroup(const Config::DbGroupPtr& group, QList<Db*>* dbLi
     }
     else
     {
-        // If db is managed by manager, it means it was successfully loaded.
-        // Otherwise there was a problem with the file, or with plugin for that database
-        // and we still want to have dbtree item for that database, we will just hide it.
-        // Later, when plugin is loaded, item might become visible.
+        db = DBLIST->getByName(group->referencedDbName);
+
+        // Databases referenced in groups must exist on database list. If not, we ignore them.
+        // Even invalid (no plugin, no file) databases have entry in dblist.
+        if (!db)
+            return;
+
         item = DbTreeItemFactory::createDb(group->referencedDbName, this);
         item->setDb(group->referencedDbName);
-
-        db = DBLIST->getByName(group->referencedDbName);
-        if (db && dbList)
+        if (dbList)
             dbList->removeOne(db);
     }
 
@@ -297,6 +298,7 @@ void DbTreeModel::dbUpdated(const QString& oldName, Db* db)
 
     item->setText(db->getName());
     item->setDb(db->getName());
+    item->updateDbIcon();
 }
 
 void DbTreeModel::dbRemoved(Db* db)