From 427ac04c4dc5f5ab920205001f05c46f82aa048c Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Mon, 30 Mar 2015 06:55:33 +0000
Subject: [PATCH] TestEGr 1.6c6 : - aggiornamento per codici di protezione.

---
 TestEGr.cpp    |  22 ++++++++++------------
 TestEGr.rc     | Bin 25344 -> 25344 bytes
 TestEGrDlg.cpp |  25 ++++++++++++++-----------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/TestEGr.cpp b/TestEGr.cpp
index d4ca8ed..f46f318 100644
--- a/TestEGr.cpp
+++ b/TestEGr.cpp
@@ -32,18 +32,14 @@
 #endif
 
 //--------------------------- Define -----------------------------------------
-#if defined( _WIN64)
-   #if defined( NDEBUG)
-      #define STR_EXE           "TestEGrR64.exe"
-   #else
-      #define STR_EXE           "TestEGrD64.exe"
-   #endif
-#elif defined( _WIN32)
-   #if defined( NDEBUG)
-      #define STR_EXE           "TestEGrR32.exe"
-   #else
-      #define STR_EXE           "TestEGrD32.exe"
-   #endif
+#if defined( _WIN64)  &&  defined( NDEBUG)
+   #define STR_EXE     "TestEGrR64.exe"
+#elif defined( _WIN64)
+   #define STR_EXE     "TestEGrD64.exe"
+#elif defined( _WIN32)  &&  defined( NDEBUG)
+   #define STR_EXE     "TestEGrR32.exe"
+#else
+   #define STR_EXE     "TestEGrD32.exe"
 #endif
 
 using namespace std ;
@@ -102,6 +98,8 @@ CTestEGrApp::InitInstance( void)
   // imposto la chiave di protezione
    string sKey = GetPrivateProfileStringUtf8( "General", "Key", "", m_pszProfileName) ;
    SetEGkKey( sKey) ;
+   SetEGrKey( sKey) ;
+   SetEExKey( sKey) ;
 
   // inizializzo il font manager
    string sNfeFontDir = GetPrivateProfileStringUtf8( "GeomDB", "NfeFontDir", "", m_pszProfileName) ;
diff --git a/TestEGr.rc b/TestEGr.rc
index f55e97646a219c1ccb72065f46a4c3d9eca2e1d6..61819d2e7273f708e1aadb0a565d54ac3881dae2 100644
GIT binary patch
delta 119
zcmZoT#@KL-al=1FMzhWT6`h$G%_bkz7N6{(F1EQqwTcBSdYx(VA)NvwnFL*^%xR{{
l%S<YeWC~PW7&lKaGXt6fG!7^|$)*NLIzbmG-C)<C0suyxD#HK(

delta 119
zcmZoT#@KL-al=1FM#Ihj6`h$G4JRMe7N6{(F1EQqwTcBSdYx(VA)NvwnFL*^%xR{{
l%S<YeWC~PW7&lKaGXt6fG!7^|$)*NLIzbmG-C)<C0suTODw_ZR

diff --git a/TestEGrDlg.cpp b/TestEGrDlg.cpp
index 7ace78c..cd83b05 100644
--- a/TestEGrDlg.cpp
+++ b/TestEGrDlg.cpp
@@ -637,19 +637,22 @@ CTestEGrDlg::OnClose( void)
    if ( ! ManageModified())
       return ;
 
-  // salvo il tipo di visualizzazione
-   int nShMode = m_View.GetScene()->GetShowMode() ;
-   WritePrivateProfileInt( "Scene", "ShowMode", nShMode, AfxGetApp()->m_pszProfileName) ;
+  // se scena ok
+   if ( m_View.GetScene() != nullptr) {
+     // salvo il tipo di visualizzazione
+      int nShMode = m_View.GetScene()->GetShowMode() ;
+      WritePrivateProfileInt( "Scene", "ShowMode", nShMode, AfxGetApp()->m_pszProfileName) ;
 
-  // salvo stato visualizzazione direzione curve
-   bool bCrvDir = m_View.GetScene()->GetShowCurveDirection() ;
-   WritePrivateProfileInt( "Scene", "CurveDir", bCrvDir, AfxGetApp()->m_pszProfileName) ;
+     // salvo stato visualizzazione direzione curve
+      bool bCrvDir = m_View.GetScene()->GetShowCurveDirection() ;
+      WritePrivateProfileInt( "Scene", "CurveDir", bCrvDir, AfxGetApp()->m_pszProfileName) ;
 
-  // salvo gli angoli di vista
-   double dAngVdeg, dAngOdeg ;
-   m_View.GetScene()->GetCamera( &dAngVdeg, &dAngOdeg) ;
-   string sOut = ToString( dAngVdeg, 1) + "," + ToString( dAngOdeg, 1) ;
-   WritePrivateProfileStringUtf8( "Scene", "View", sOut.c_str(), AfxGetApp()->m_pszProfileName) ;
+     // salvo gli angoli di vista
+      double dAngVdeg, dAngOdeg ;
+      m_View.GetScene()->GetCamera( &dAngVdeg, &dAngOdeg) ;
+      string sOut = ToString( dAngVdeg, 1) + "," + ToString( dAngOdeg, 1) ;
+      WritePrivateProfileStringUtf8( "Scene", "View", sOut.c_str(), AfxGetApp()->m_pszProfileName) ;
+   }
 
   // salvo lo stato della finestra del dialogo
    WINDOWPLACEMENT winPlace ;