From 49d2577328e7743ee26b0d3d6707ff03e59f6222 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 12 Oct 2017 17:55:16 +0000
Subject: [PATCH] EgtMachKernel 1.8j3 : - sistemato aggiornamento utensili
 attrezzati in macchina al salvatggio DB utensili.

---
 EgtMachKernel.rc   | Bin 11782 -> 11782 bytes
 MachMgrDBTools.cpp |  15 +++++++++++----
 ToolsMgr.h         |   2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 7fce8fb98057cb0a795294bbc32ac0b7124bf62d..e6b14c81acf6b2f0fe5ec07a70b8ad95dc7b46b6 100644
GIT binary patch
delta 97
zcmZpRX^YwLhmFyA^ItYwW=7-5j>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh
Hr8(RHPhB8F

delta 97
zcmZpRX^YwLhmFx_^ItYwW=5mQj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh
Hr8(RHP01iS

diff --git a/MachMgrDBTools.cpp b/MachMgrDBTools.cpp
index 148c712..cfd11c8 100644
--- a/MachMgrDBTools.cpp
+++ b/MachMgrDBTools.cpp
@@ -263,14 +263,21 @@ MachMgr::TdbSave( void) const
    ToolsMgr* pTsMgr = GetCurrToolsMgr() ;
    if ( pTsMgr == nullptr)
       return nullptr ;
-  // se macchina caricata, ne scarico tutti gli utensili
+  // se non ci sono state modifiche, esco subito
+   if ( ! pTsMgr->GetModified())
+      return true ;
+  // salvo il db utensili
+   if ( ! pTsMgr->Save())
+      return false ;
+  // se macchina caricata, ne scarico e ricarico tutti gli utensili
    if ( IsCurrMachineLoaded()) {
       Machine* pMach = GetCurrMachine() ;
-      if ( pMach != nullptr)
+      if ( pMach != nullptr) {
          pMach->UnloadAllTools() ;
+         pMach->LoadAllTools() ;
+      }
    }
-  // salvo il db utensili
-   return pTsMgr->Save() ;
+   return true ;
 }
 
 //----------------------------------------------------------------------------
diff --git a/ToolsMgr.h b/ToolsMgr.h
index 4b17f63..e6b911c 100644
--- a/ToolsMgr.h
+++ b/ToolsMgr.h
@@ -27,6 +27,8 @@ class ToolsMgr
       ToolsMgr( void) ;
       bool Load( const std::string& sToolsFile) ;
       bool Reload( void) ;
+      bool GetModified( void)
+              { return m_bModified ; }
       bool Save( bool bCompressed = true) const ;
       bool GetToolNewName( std::string& sName) const ;
       bool AddTool( const std::string& sName, int nType) ;