diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 7657fa4..530556c 100644
Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ
diff --git a/MachMgr.h b/MachMgr.h
index ef0bb46..f9b619b 100644
--- a/MachMgr.h
+++ b/MachMgr.h
@@ -163,6 +163,7 @@ class MachMgr : public IMachMgr
       bool TdbGetToolHolderDir( std::string& sTHolderDir) const override ;
      // Setup
       int  GetCurrSetup( void) const override ;
+      bool GetDefaultSetupName( std::string& sName) const override ;
       bool ImportSetup( const std::string& sName) override ;
      // Machinings DataBase
       bool MdbGetMachiningNewName( std::string& sName) const override ;
diff --git a/MachMgrSetup.cpp b/MachMgrSetup.cpp
index bdcc836..bffbc0d 100644
--- a/MachMgrSetup.cpp
+++ b/MachMgrSetup.cpp
@@ -26,6 +26,26 @@ MachMgr::GetCurrSetup( void) const
    return GetCurrSetupGroupId() ;
 }
 
+//----------------------------------------------------------------------------
+bool
+MachMgr::GetDefaultSetupName( string& sName) const
+{
+  // verifico esista macchina corrente
+   Machine* pMch = GetCurrMachine() ;
+   if ( pMch == nullptr)
+      return false ;
+  // recupero da file Ini della macchina
+   //string sMachIni = m_sMachinesDir + "\\" + GetCurrMGeoName() + "\\" + GetCurrMGeoName() + ".ini" ;
+   string sMachIni = pMch->GetMachineDir() + "\\" + pMch->GetMachineName() + ".ini" ;
+   string sDefault = GetPrivateProfileStringUtf8( SETUP_SEC.c_str(), SETUP_DEF_KEY.c_str(), "", sMachIni.c_str()) ;
+  // se non trovato, errore
+   if ( IsEmptyOrSpaces( sDefault))
+      return false ;
+  // assegno il nome
+   sName = sDefault ;
+   return true ;
+}
+
 //----------------------------------------------------------------------------
 bool
 MachMgr::ImportSetup( const string& sName)
@@ -38,12 +58,10 @@ MachMgr::ImportSetup( const string& sName)
    }
   // altrimenti cerco default
    else {
-      string sMachIni = m_sMachinesDir + "\\" + GetCurrMGeoName() + "\\" + GetCurrMGeoName() + ".ini" ;
-      string sDefault = GetPrivateProfileStringUtf8( SETUP_SEC.c_str(), SETUP_DEF_KEY.c_str(), "", sMachIni.c_str()) ;
-      if ( ! IsEmptyOrSpaces( sDefault))
-         sFileName += sDefault + "." + SETUP_EXT ;
-      else
+      string sDefault ;
+      if ( ! GetDefaultSetupName( sDefault))
          return false ;
+      sFileName += sDefault + "." + SETUP_EXT ;
    }
 
   // gestione attrezzaggio
@@ -56,4 +74,4 @@ MachMgr::ImportSetup( const string& sName)
 
   // lo inserisco nel progetto
    return stuMgr.Save() ;
-}
\ No newline at end of file
+}