PR: allow interactive and batch mode on Visu: different behavior for Mutex

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index cc88eefe84ea365d3f37ade66a0684d16aa8ba47..f11d1ab2fe73d4ba9079a24098819cac23ececfb 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -62,9 +62,9 @@ using namespace std;
 static QFileInfo aFileInfo;
 
 #ifdef _DEBUG_
-static int MYDEBUG = 0;
+static int MYDEBUG = 1;
 #else
-static int MYDEBUG = 0;
+static int MYDEBUG = 1;
 #endif
 
 extern "C" {
@@ -168,7 +168,9 @@ namespace VISU{
     Engines_Component_i()
   {
     if(MYDEBUG) MESSAGE("VISU_Gen_i::VISU_Gen_i : "<<theMutex);
-    //Mutex mt(theMutex,qApp);
+    if (! Mutex::callFromGUI)
+      Mutex mt(theMutex,qApp);
+    else Mutex::callFromGUI = 0;
     Base_i::myMutex = theMutex;  //apo
     Base_i::myOrb = CORBA::ORB::_duplicate(theORB);
     Base_i::myPoa = PortableServer::POA::_duplicate(thePOA);
@@ -402,7 +404,8 @@ namespace VISU{
     //omni_mutex_lock aMutexLock(aMutex);
     if(MYDEBUG) MESSAGE("VISU_Gen_i::GetViewManager : "<<myMutex);
     if(myMutex){
-      SMutex mt(myMutex,qApp);
+      //SMutex mt(myMutex,qApp);
+      Mutex mt(myMutex,qApp);
       ViewManager_i * aViewManager = new ViewManager_i(myStudyDocument);
       return ViewManager::_duplicate(aViewManager->_this());
     }