From 910a5fcb2ce8fd164e24762eaeed5760221aaa61 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sun, 31 May 2020 21:25:13 +0000
Subject: [PATCH] EgtMachKernel 2.2f1 : - corretta segnalazione errore
 caricamento TcPos - corretta gestione e segnalazione caricamento gruppo di
 lavoro non riuscito.

---
 EgtMachKernel.rc      | Bin 11774 -> 11774 bytes
 MachMgrMachGroups.cpp |   5 ++++-
 MachineLua.cpp        |   2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 878a4d51dd365bd79b95380d8950e95b9ba5173c..2073082536ced9554a214a1cd6c47190f7230d4b 100644
GIT binary patch
delta 121
zcmewt{V#gMH#Sx?1|0^&&A-{KnVHiV3@1O7)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL
R=2g-z%(yjz6ex#q0RV5MCZGTS

delta 121
zcmewt{V#gMH#SyN1|0^Y&A-{KnVC}=j3z&n)ZLuM)x!c8zsNNCgkT;*P6$a3MUMyL
R=2g-z%(yjz6ex#q0RV4}CZGTS

diff --git a/MachMgrMachGroups.cpp b/MachMgrMachGroups.cpp
index 13362eb..217076a 100644
--- a/MachMgrMachGroups.cpp
+++ b/MachMgrMachGroups.cpp
@@ -371,7 +371,10 @@ MachMgr::PrepareCurrMachGroup( int nId)
    m_nCurrMGrpId = nId ;
    m_cCurrMGrp = mgData ;
    m_nCurrMch = GetMachine( m_cCurrMGrp.MGeoName) ;
-   m_stuMgr.Init( this) ;
+   if ( ! m_stuMgr.Init( this)) {
+      m_nCurrMGrpId = GDB_ID_NULL ;
+      return false ;
+   }
    m_stuMgr.Load() ;
    m_nPhasesCount = CalcPhaseCount() ;
    m_nCurrPhase = 0 ;
diff --git a/MachineLua.cpp b/MachineLua.cpp
index dcddb30..e203a88 100644
--- a/MachineLua.cpp
+++ b/MachineLua.cpp
@@ -804,7 +804,7 @@ Machine::LuaEmtTcPos( lua_State* L)
 
   // carico i dati della posizione cambio utensile
    if ( ! m_pMchLua->LoadMachineTcPos( sName, sParent, ptPos, vtTDir, vtADir, sGeo, vsAux))
-      return luaL_error( L, " Load Machine Standard Head failed") ;
+      return luaL_error( L, " Load Machine Tc Position failed") ;
 
   // restituisco l'indice della posizione cambio utensile
    int nTcPosId = m_pMchLua->GetTcPosId( sName) ;