From db15bd06ce565cf62765c4912aab17ec876d1164 Mon Sep 17 00:00:00 2001 From: abd Date: Wed, 22 Nov 2006 11:52:07 +0000 Subject: [PATCH] Crash on copy operation --- src/VISU_I/VISU_Gen_i.cc | 42 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index a278a3a1..04a9ca15 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -86,7 +86,6 @@ #include #include "Utils_ExceptHandlers.hxx" -#include "CASCatch.hxx" #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 #define NO_CAS_CATCH @@ -252,23 +251,40 @@ namespace VISU const char* theFieldName, CORBA::Double theIteration) { - CASCatch_TRY{ #ifndef _DEXCEPT_ +# ifdef NO_CAS_CATCH + try{ + OCC_CATCH_SIGNALS; +# else + CASCatch_TRY{ try{ +# endif + #endif - if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration))) - return true; + if(theColoredPrs3d->Create(theMeshName,theEntity,theFieldName,int(theIteration))) + return true; #ifndef _DEXCEPT_ - }catch(std::exception& exc){ - INFOS("Follow exception was occured :\n"<GetMessageString()); + }catch(std::exception& exc){ + INFOS("Follow exception was occured :\n"<GetMessageString()); + } +# endif +#endif return false; } @@ -1088,7 +1104,7 @@ namespace VISU aFileName += aFileInfo.fileName().latin1(); static QString aCommand; string aFullFileName = aTmpDir + aFileName; - aCommand.sprintf(" %s %s",aFileInfo.filePath(), aFullFileName.c_str() ); + aCommand.sprintf(" %s %s",aFileInfo.filePath().latin1(), aFullFileName.c_str() ); aCommand = QDir::convertSeparators( aCommand ); aCommand.prepend( COPY_COMMAND ); -- 2.39.2