New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

1 files changed, 6 insertions, 3 deletions

diff --git a/SQLiteStudio3/sqlitestudiocli/cli.cpp b/SQLiteStudio3/sqlitestudiocli/cli.cpp
index 30bf175..6251745 100644
--- a/SQLiteStudio3/sqlitestudiocli/cli.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/cli.cpp
@@ -120,6 +120,7 @@ Db* CLI::getCurrentDb() const
 
 void CLI::exit()
 {
+    SQLITESTUDIO->cleanUp();
     doExit = true;
 }
 
@@ -245,23 +246,25 @@ void CLI::applyHistoryLimit()
 #endif
 }
 
-void CLI::openDbFile(const QString& path)
+bool 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;
+        setCurrentDb(db);
+        return true;
     }
 
     QString name = DBLIST->quickAddDb(path, QHash<QString,QVariant>());
     if (name.isNull())
     {
         println(tr("Could not add database %1 to list.").arg(path));
-        return;
+        return false;
     }
     db = DBLIST->getByName(name);
     setCurrentDb(db);
+    return true;
 }
 
 void CLI::doWork()