#2555 Bugfix

ApplicationCode/Application/RiaApplication.cpp

@@ -1860,7 +1860,7 @@ bool RiaApplication::openFile(const QString& fileName)
     }
     else if (fileName.contains(".egrid", Qt::CaseInsensitive) || fileName.contains(".grid", Qt::CaseInsensitive))
     {
-        loadingSucceded = !RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ fileName })).isEmpty();
+        loadingSucceded = RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ fileName }));
     }
     else if (fileName.contains(".grdecl", Qt::CaseInsensitive))
     {

ApplicationCode/Application/Tools/RiaArgumentParser.cpp

@@ -272,21 +272,21 @@ bool RiaArgumentParser::parseArguments()
             if (caf::Utils::fileExists(caseName) &&
                 (fileExtension == "EGRID" || fileExtension == "GRID"))
             {
-                RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ caseName }), true);
+                RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ caseName }), nullptr, true);
             }
             else
             {
                 QString caseFileNameWithExt = caseName + ".EGRID";
                 if (caf::Utils::fileExists(caseFileNameWithExt))
                 {
-                    RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ caseFileNameWithExt }), true);
+                    RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ caseFileNameWithExt }), nullptr, true);
                 }
                 else
                 {
                     caseFileNameWithExt = caseName + ".GRID";
                     if (caf::Utils::fileExists(caseFileNameWithExt))
                     {
-                        RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ caseFileNameWithExt }), true);
+                        RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({ caseFileNameWithExt }), nullptr, true);
                     }
                 }
             }

ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp

@@ -56,13 +56,11 @@
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-QStringList RiaImportEclipseCaseTools::openEclipseCasesFromFile(const QStringList& fileNames, bool noDialog)
+bool RiaImportEclipseCaseTools::openEclipseCasesFromFile(const QStringList& fileNames, QStringList* openedFiles, bool noDialog)
 {
     RiaApplication* app = RiaApplication::instance();
     RimProject* project = app->project();
 
-    QStringList openedCaseFiles;
-
     // Get list of files to import
     RifSummaryCaseRestartSelector selector;
     if(noDialog) selector.showDialog(false);
@@ -74,7 +72,7 @@ QStringList RiaImportEclipseCaseTools::openEclipseCasesFromFile(const QStringLis
     {
         if (RiaImportEclipseCaseTools::openEclipseCaseFromFile(gridCaseFile))
         {
-            openedCaseFiles.push_back(gridCaseFile);
+            if(openedFiles) openedFiles->push_back(gridCaseFile);
         }
     }
 
@@ -124,7 +122,7 @@ QStringList RiaImportEclipseCaseTools::openEclipseCasesFromFile(const QStringLis
             sumCaseColl->updateAllRequiredEditors();
         }
     }
-    return openedCaseFiles;
+    return true;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.h

@@ -27,7 +27,7 @@ class QStringList;
 class RiaImportEclipseCaseTools
 {
 public:
-    static QStringList openEclipseCasesFromFile(const QStringList& fileNames, bool noDialog = false);
+    static bool openEclipseCasesFromFile(const QStringList& fileNames, QStringList* openedFiles = nullptr, bool noDialog = false);
     static bool openEclipseCaseShowTimeStepFilter(const QString& fileName);
     
     static bool openMockModel(const QString& name);

ApplicationCode/CommandFileInterface/RicfLoadCase.cpp

@@ -39,8 +39,8 @@ RicfLoadCase::RicfLoadCase()
 //--------------------------------------------------------------------------------------------------
 void RicfLoadCase::execute()
 {
-    QStringList newCaseFiles = RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({m_path()}), true);
+    bool ok = RiaImportEclipseCaseTools::openEclipseCasesFromFile(QStringList({m_path()}), nullptr, true);
-    if (newCaseFiles.isEmpty())
+    if (!ok)
     {
         RiaLogging::error(QString("loadCase: Unable to load case from %1").arg(m_path()));
     }

ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp

@@ -54,7 +54,8 @@ void RicImportEclipseCaseFeature::onActionTriggered(bool isChecked)
     if (fileNames.size()) defaultDir = QFileInfo(fileNames.last()).absolutePath();
     app->setLastUsedDialogDirectory("BINARY_GRID", defaultDir);
 
-    QStringList newCaseFiles = RiaImportEclipseCaseTools::openEclipseCasesFromFile(fileNames);
+    QStringList newCaseFiles;
+    RiaImportEclipseCaseTools::openEclipseCasesFromFile(fileNames, &newCaseFiles);
 
     for (const auto newCaseFile : newCaseFiles)
     {

ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp

@@ -68,7 +68,8 @@ void RicImportEclipseCasesFeature::onActionTriggered(bool isChecked)
     // Remember the path to next time
     app->setLastUsedDialogDirectory("BINARY_GRID", QFileInfo(result.rootDir).absoluteFilePath());
 
-    QStringList newCaseFiles = RiaImportEclipseCaseTools::openEclipseCasesFromFile(result.files);
+    QStringList newCaseFiles;
+    RiaImportEclipseCaseTools::openEclipseCasesFromFile(result.files, &newCaseFiles);
 
     for (const auto newCaseFile : newCaseFiles)
     {