OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7785 from OPM/octave-fix

Browse Source 
Octave : Always execute command objects in queue before return
This commit is contained in:
Magne Sjaastad 2021-06-16 07:16:38 +02:00 committed by GitHub
commit 8a2def774a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/Application/RiaGuiApplication.cpp
View File

@ -1582,6 +1582,9 @@ void RiaGuiApplication::slotWorkerProcessFinished( int exitCode, QProcess::ExitS
}
m_workerProcess = nullptr;
// Always make sure the command objects are executed before any return statement
executeCommandObjects();
// Either the work process crashed or was aborted by the user
if ( exitStatus == QProcess::CrashExit )
{
@ -1590,8 +1593,6 @@ void RiaGuiApplication::slotWorkerProcessFinished( int exitCode, QProcess::ExitS
return;
}
executeCommandObjects();
// Exit code != 0 means we have an error
if ( exitCode != 0 )
{