Fixed cppcheck-opensource#7946 (GUI-CLI: Priorize specific command line parameters to guessing)

danmar · danmar · commit 80367095dbfb · 2017-06-25T22:18:51.000+02:00
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -222,8 +222,6 @@ void MainWindow::HandleCLIParams(const QStringList &params)
         index = params.indexOf("-p");
         if ((index + 1) < params.length())
             LoadProjectFile(params[index + 1]);
-    } else if ((index = params.indexOf(QRegExp(".*\\.cppcheck$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
-        LoadProjectFile(params[index]);
     } else if (params.contains("-l")) {
         QString logFile;
         index = params.indexOf("-l");
@@ -240,6 +238,8 @@ void MainWindow::HandleCLIParams(const QStringList &params)
         } else {
             LoadResults(logFile);
         }
+    } else if ((index = params.indexOf(QRegExp(".*\\.cppcheck$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
+        LoadProjectFile(params[index]);
     } else if ((index = params.indexOf(QRegExp(".*\\.xml$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
         LoadResults(params[index],QDir::currentPath());
     } else
