From 40f3f3e0238536c1a3f1925438b09880adf2eb48 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 12 Jul 2016 10:45:21 +0000 Subject: [PATCH] =?UTF-8?q?EgtMachKernel=201.6s4=20:=20-=20gestione=20file?= =?UTF-8?q?=20mlde=20in=20sostituzione=20degli=20mde=20(si=20leggono=20anc?= =?UTF-8?q?ora=20per=20compatibilit=C3=A0=20in=20assenza=20di=20mlde).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EgtMachKernel.rc | Bin 11782 -> 11782 bytes Machine.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 6e41cf968021f07cfe985f9467abb56bd031af76..ed06facf7f7d3f8eaf63066201b9c336a3b52c6d 100644 GIT binary patch delta 97 zcmZpRX^YwLhmFx>^ItYwW=50Aj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHQ1Kv2 delta 97 zcmZpRX^YwLhmFyA^ItYwW=7-5j>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHPhB8F diff --git a/Machine.cpp b/Machine.cpp index adf9aeb..851ef32 100644 --- a/Machine.cpp +++ b/Machine.cpp @@ -109,8 +109,10 @@ Machine::Init( const string& sMachinesDir, const string& sMachineName, MachMgr* m_nGroupId = nId ; m_sName = sMachineName ; // carico la macchina { - string sMachineMde = m_sMachineDir + "\\" + sMachineName + ".Mde" ; - bool bOk = LuaLoadMachine( sMachineMde) ; + string sMachineMlde = m_sMachineDir + "\\" + sMachineName + ".Mlde" ; + if ( ! ExistsFile( sMachineMlde)) + sMachineMlde = m_sMachineDir + "\\" + sMachineName + ".Mde" ; + bool bOk = LuaLoadMachine( sMachineMlde) ; // cancello il gruppo temporaneo m_pGeomDB->Erase( m_nTempGroupId) ; m_nTempGroupId = GDB_ID_NULL ;