From: vsr <vsr@opencascade.com>
Date: Thu, 16 Nov 2017 11:41:29 +0000 (+0300)
Subject: 0023505: Sigsegv with fuse on cylinder and cone
X-Git-Tag: V8_4_0rc3^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1d6c9a8214972e4d589f3659e30eeec6a0f48073;p=modules%2Fgui.git

0023505: Sigsegv with fuse on cylinder and cone
- Switch to C++ exception handling mechanism
---

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index 0dfcba7e2..36534eee5 100644
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -23,8 +23,6 @@
 #include "SalomeApp_ExceptionHandler.h"
 #include "Utils_CorbaException.hxx"
 
-#include "CASCatch.hxx"
-
 #include <OSD.hxx>
 
 #include <stdexcept>
@@ -55,13 +53,14 @@ bool SalomeApp_ExceptionHandler::handleSignals( QObject* o, QEvent* e )
 {
   bool result = true;
 
-  try {
+  try
+  {
     OCC_CATCH_SIGNALS;
     result = SUIT_ExceptionHandler::internalHandle( o, e );
   }
-  catch(Standard_Failure) {
-    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
-    throw Standard_Failure( aFail->GetMessageString() );
+  catch( Standard_Failure& e )
+  {
+    throw Standard_Failure( e.GetMessageString() );
   }
 
   return result;