From: epa <epa@opencascade.com>
Date: Thu, 12 Oct 2006 14:34:10 +0000 (+0000)
Subject: Rolling back incorrect integration
X-Git-Tag: V3_2_3pre1~24
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5e956a15ecff341daa2b347ee510762db96c79ec;p=modules%2Fgui.git

Rolling back incorrect integration
---

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index 81cd56b04..d030d3c37 100644
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -36,7 +36,14 @@
 SalomeApp_ExceptionHandler::SalomeApp_ExceptionHandler( const bool floatSignal )
 : SUIT_ExceptionHandler()
 {
-  OSD::SetSignal( floatSignal );
+  // JFA 2006-09-28: PAL10867: suppress signal catching,
+  // if environment variable DISABLE_SIGNALS_CATCHING is set to 1.
+  // Commonly this is used with "noexcepthandler" option.
+  char* envNoCatchSignals = getenv("NOT_INTERCEPT_SIGNALS");
+  if (!envNoCatchSignals || !atoi(envNoCatchSignals))
+  {
+    OSD::SetSignal( floatSignal );
+  }
 }
 
 /*!Try to call SUIT_ExceptionHandler::internalHandle(o, e), catch if failure.*/
@@ -104,5 +111,6 @@ extern "C" SALOMEAPP_EXPORT SUIT_ExceptionHandler* getExceptionHandler()
 #else
   raiseFPE = false;
 #endif
+
   return new SalomeApp_ExceptionHandler( raiseFPE );
 }