If we have file passed from the cli, skip autoLoadLastDBFileAtStartup

sandman7920 · lucydodo · commit dac47f9335c6 · 2024-09-11T10:05:20.000+09:00
diff --git a/src/Application.cpp b/src/Application.cpp
@@ -285,6 +285,9 @@ Application::Application(int& argc, char** argv) :
     QScreen *screen = primaryScreen();
     setStyle(new DB4SProxyStyle(18, screen != nullptr ? screen->logicalDotsPerInch() : 96, style()));
 
+    // Skip db/project autoLoadLastDBFileAtStartup if we have file passed from the cli
+    Settings::setValue("tmp", "fileWillBeOpenedFromCLI", !fileToOpen.isEmpty(), false);
+
     // Show main window
     m_mainWindow = new MainWindow();
     m_mainWindow->show();
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -95,7 +95,8 @@ MainWindow::MainWindow(QWidget* parent)
         populateStructure(old_tables);
     };
 
-    if (Settings::getValue("General", "autoLoadLastDBFileAtStartup").toBool()) {
+    if (!Settings::getValue("tmp", "fileWillBeOpenedFromCLI").toBool() &&
+        Settings::getValue("General", "autoLoadLastDBFileAtStartup").toBool()) {
         recentFileActs[0]->trigger();
         update_structure();
         if (ui->mainTab->currentWidget() == ui->browser)
