From 83ab192ee779f5741cc3ebcc04e7a6171841c65d Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Tue, 10 Dec 2019 14:59:50 +0000
Subject: [PATCH] EgtExecutor 2.1l5 : - in Exe e Lua Simulate inserito
 aggiornamento preliminare delle lavorazioni.

---
 EXE_MachMgr.cpp |  12 +++++++++++-
 EgtExecutor.rc  | Bin 16184 -> 16184 bytes
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp
index f676ac5..a3fff0d 100644
--- a/EXE_MachMgr.cpp
+++ b/EXE_MachMgr.cpp
@@ -2776,10 +2776,20 @@ ExeEstimate( const string& sEstFile, const string& sInfo)
 
 //-----------------------------------------------------------------------------
 bool
-ExeSimulate( int& nErr, std::string& sError)
+ExeSimulate( int& nErr, string& sError)
 {
    IMachMgr* pMachMgr = GetCurrMachMgr() ;
    VERIFY_MACHMGR( pMachMgr, false)
+  // forzo aggiornamento
+   if ( ! ExeApplyAllMachinings( false, false, sError)) {
+     // assegno il codice di errore
+      nErr = SHE_INIT ;
+     // assegno stringa di errore
+      sError = "Starting simulation failed" ;
+      ExeOutLog( sError, 1) ;
+     // esco
+      return false ;
+   }
   // inizializzo lo stato
    bool bContinue = true ;
    nErr = SHE_NONE ;
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 0dc7393cffc60719aa0060ed8d4c83790d6e5b60..6e11ee56e9ad8c0f06fd6da02e47c7cc65418561 100644
GIT binary patch
delta 97
zcmdl{x1(;uA2vqQ%@@V4Gflq2na5~4Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21*>V0K6d|N&o-=

delta 97
zcmdl{x1(;uA2vpl%@@V4Gflq2na5}{Ignd-a{*Tk3sCf++-0W82LxfF21;&>n->Y|
cF@rU@0x76sKgP|Iq`|@m<s4zc21*>V0J@tWLI3~&