From 8a546aa09fb0124185dc620882f68d1eddedb5f1 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Fri, 21 Jul 2017 13:00:54 +0000
Subject: [PATCH] EgtInterface 1.8g4 : - corretta gestione messaggi di errore
 in EgtApplyAllMachinings e EgtUpdateAllMachinings.

---
 API_MachMgr.cpp |  10 ++++------
 EgtInterface.rc | Bin 11716 -> 11716 bytes
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/API_MachMgr.cpp b/API_MachMgr.cpp
index 06cd115..a1bfd18 100644
--- a/API_MachMgr.cpp
+++ b/API_MachMgr.cpp
@@ -1386,10 +1386,9 @@ __stdcall EgtApplyAllMachinings( BOOL bStopOnFirstErr, wchar_t*& wsErrList)
    if ( &wsErrList == nullptr)
       return FALSE ;
    string sErrList ;
-   if ( ! ExeApplyAllMachinings( bStopOnFirstErr != FALSE, sErrList))
-      return FALSE ;
+   bool bOk = ExeApplyAllMachinings( bStopOnFirstErr != FALSE, sErrList) ;
    wsErrList = _wcsdup( stringtoW( sErrList)) ;
-   return  (( wsErrList == nullptr) ? FALSE : TRUE) ;
+   return ( ( bOk && wsErrList != nullptr) ? TRUE : FALSE) ;
 }
 
 //-----------------------------------------------------------------------------
@@ -1399,10 +1398,9 @@ __stdcall EgtUpdateAllMachinings( BOOL bStopOnFirstErr, wchar_t*& wsErrList)
    if ( &wsErrList == nullptr)
       return FALSE ;
    string sErrList ;
-   if ( ! ExeUpdateAllMachinings( bStopOnFirstErr != FALSE, sErrList))
-      return FALSE ;
+   bool bOk = ExeUpdateAllMachinings( bStopOnFirstErr != FALSE, sErrList) ;
    wsErrList = _wcsdup( stringtoW( sErrList)) ;
-   return  (( wsErrList == nullptr) ? FALSE : TRUE) ;
+   return ( ( bOk && wsErrList != nullptr) ? TRUE : FALSE) ;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/EgtInterface.rc b/EgtInterface.rc
index 1b1a6281fef34feec031948d30e40da809012804..f89edd2db21fb80c796df5af60e11d91b28b1c1a 100644
GIT binary patch
delta 92
zcmX>SeI$CrFE&P#%^&$rGEF|hS;uHH`Jtfh<^rw;7O<!@GgQPu$%}FG8eu&kAEJ1P
SBusID6j<>^IY)%z7H$Avogmx*

delta 92
zcmX>SeI$CrFE&Qw%^&$rGEF|hS;uHR`Jtfh<^rw;7O<!@GgQPu$%}FG8eu&kAEJ1P
SBusID6j<>^IY)%z7H$AuEg;kY