Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

# gpg: Signature made Sun 22 Feb 2015 02:06:37 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, 8 insertions, 1 deletions

diff --git a/SQLiteStudio3/sqlitestudiocli/cli.cpp b/SQLiteStudio3/sqlitestudiocli/cli.cpp
index a663e84..0f527ac 100644
--- a/SQLiteStudio3/sqlitestudiocli/cli.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/cli.cpp
@@ -222,13 +222,20 @@ void CLI::applyHistoryLimit()
 
 void CLI::openDbFile(const QString& path)
 {
+    Db* db = DBLIST->getByPath(path);
+    if (db)
+    {
+        println(tr("Database passed in command line parameters (%1) was already on the list under name: %2").arg(path, db->getName()));
+        return;
+    }
+
     QString name = DBLIST->quickAddDb(path, QHash<QString,QVariant>());
     if (name.isNull())
     {
         println(tr("Could not add database %1 to list.").arg(path));
         return;
     }
-    Db* db = DBLIST->getByName(name);
+    db = DBLIST->getByName(name);
     setCurrentDb(db);
 }