From 68b7edec5b5c04d74aa03d4d0f52a518e2ea42d7 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Wed, 14 Sep 2016 09:34:22 +0000
Subject: [PATCH] EgtExecutor 1.6u1 : - con NewFile si fa reset di Pezzo/layer
 correnti.

---
 EXE_GdbPartLayers.cpp |   2 +-
 EXE_GeomDB.cpp        |   4 ++++
 EgtExecutor.rc        | Bin 11694 -> 11694 bytes
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/EXE_GdbPartLayers.cpp b/EXE_GdbPartLayers.cpp
index 40721ad..b42c3e8 100644
--- a/EXE_GdbPartLayers.cpp
+++ b/EXE_GdbPartLayers.cpp
@@ -139,7 +139,7 @@ ExeSetCurrPartLayer( int nPartId, int nLayerId)
      bOk = false ;
    }
   // verifico validità e visibilità layer
-   if ( pGeomDB->GetParentId( nLayerId) == nPartId  &&
+   if ( pGeomDB->GetParentId( nLayerId) == pGseCtx->m_nCurrPart  &&
         ExeIsUserObj( pGeomDB, nLayerId)  &&
         ExeIsVisibleObj( pGeomDB, nLayerId)) {
       pGseCtx->m_nCurrLayer = nLayerId ;
diff --git a/EXE_GeomDB.cpp b/EXE_GeomDB.cpp
index 28b0d70..2935edd 100644
--- a/EXE_GeomDB.cpp
+++ b/EXE_GeomDB.cpp
@@ -263,6 +263,8 @@ ExeNewFile( void)
   // aggiorno stato file corrente
    pGseCtx->m_sFilePath.clear() ;
    ExeResetModified() ;
+  // aggiorno pezzo/layer correnti
+   ExeResetCurrPartLayer() ;
   // aggiornamento gestore lavorazioni
    ExeUpdateMachMgr() ;
   // se richiesto, salvo il comando Lua equivalente
@@ -296,6 +298,8 @@ ExeOpenFile( const string& sFilePath)
    bOk = bOk && pGseCtx->m_pGeomDB->Load( sFilePath) ;
   // aggiorno stato file corrente
    ExeResetModified() ;
+  // aggiorno pezzo/layer correnti
+   ExeResetCurrPartLayer() ;
   // aggiornamento gestore lavorazioni
    ExeUpdateMachMgr() ;
   // se richiesto, salvo il comando Lua equivalente
diff --git a/EgtExecutor.rc b/EgtExecutor.rc
index 944ba9c3636856388e57c203c59148f1f43f6b9d..39ab9c10b60ee6f5c0a5692b3da81601e274b649 100644
GIT binary patch
delta 121
zcmZ1%y)Jsg4>ndq1|0^&%@@V4Gflq2nZsPlU^qFDTX%B-R|N}H?x5UdrpX5c5po7f
iZj75332QOKH9IpSY4l^<JV_cZc~H(CA!(pg#|;4Gt0H^=

delta 121
zcmZ1%y)Jsg4>nc<1|0^I%@@V4Gflq2nZsPdU@|$7TX%B-R|N}H?x5UdrpX5c5po7f
iZj75332QOKH9IpSY4l^<JV_cZc~H(CA!(pg#|;4KKO&3(