Merge pull request #4450 from TrenchBroom/4348-2

4348: Simplify and fix behavior
TrenchBroom · Jan 21, 2024 · 751acb3 · 751acb3
2 parents 68554d0 + a58c1e5
commit 751acb3
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/common/src/TrenchBroomApp.cpp b/common/src/TrenchBroomApp.cpp
@@ -599,21 +599,16 @@ bool TrenchBroomApp::event(QEvent* event)
 
 void TrenchBroomApp::openFilesOrWelcomeFrame(const QStringList& fileNames)
 {
+  const auto filesToOpen =
+    useSDI() && !fileNames.empty() ? QStringList{fileNames.front()} : fileNames;
+
   auto anyDocumentOpened = false;
-  if (useSDI())
-  {
-    if (fileNames.length() > 0)
-    {
-      const auto path = IO::pathFromQString(fileNames.at(0));
-      anyDocumentOpened = !path.empty() && openDocument(path);
-    }
-  }
-  else
+  for (const auto& fileName : filesToOpen)
   {
-    for (const auto& fileName : fileNames)
+    const auto path = IO::pathFromQString(fileName);
+    if (!path.empty() && openDocument(path))
     {
-      const auto path = IO::pathFromQString(fileName);
-      anyDocumentOpened = anyDocumentOpened || (!path.empty() && openDocument(path));
+      anyDocumentOpened = true;
     }
   }