Merge commit 'f709219506b7cd587e94abc5ebed18d629df92d8'

[modules/shaper.git] / src / SHAPERGUI / shapergui_app.cpp

diff --git a/src/SHAPERGUI/shapergui_app.cpp b/src/SHAPERGUI/shapergui_app.cpp
index a212c1c30d0f4aae73530dde4ef6465a5f4be125..8ee82429cc76111c2170de293da9fb0fc52727ad 100644 (file)
--- a/src/SHAPERGUI/shapergui_app.cpp
+++ b/src/SHAPERGUI/shapergui_app.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021  CEA/DEN, EDF R&D
+// Copyright (C) 2021-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -43,8 +43,9 @@ int main(int argc, char *argv[])
   QString gui_root_dir( QDir::fromNativeSeparators(pe.value(GUI_ROOT_DIR)) );
   QString shaper_root_dir( QDir::fromNativeSeparators(pe.value(SHAPER_ROOT_DIR)) );
   QString lightappconfig_val( QString("%1:%2")
-  .arg(QDir::toNativeSeparators(QString("%1/share/salome/resources/gui").arg(gui_root_dir)))
-  .arg(QDir::toNativeSeparators(QString("%1/share/salome/resources/shaper").arg(shaper_root_dir))));
+  .arg( QDir::toNativeSeparators( QString("%1/share/salome/resources/gui").arg(gui_root_dir) ) )
+  .arg( QDir::toNativeSeparators( QString("%1/share/salome/resources/shaper")
+        .arg(shaper_root_dir) ) ) );
   pe.insert(LIGHTAPPCONFIG,lightappconfig_val);
   //tells shutup to salome.salome_init invoked at shaper engine ignition
   pe.insert("SALOME_EMB_SERVANT","1");
@@ -55,6 +56,6 @@ int main(int argc, char *argv[])
   proc.setArguments({"--modules=SHAPER"});
   proc.setProcessChannelMode( QProcess::ForwardedErrorChannel );
   proc.start();
-  proc.waitForFinished();
+  proc.waitForFinished(-1);
   return proc.exitCode();
 }