From 11fb739535da8aef4bb033646d4c6613e1b8294b Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 19 Mar 2018 16:22:31 +0000 Subject: [PATCH] EgtDOORCreator 1.9c4 : - correzione errore durante l'aperura di un direttorio con una porta corrente modificata; - correzione eliminazione CurrHardware. --- ProjectManager/ProjectManagerHardwareVM.vb | 6 +++--- ProjectManager/ProjectManagerVM.vb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ProjectManager/ProjectManagerHardwareVM.vb b/ProjectManager/ProjectManagerHardwareVM.vb index dda0765..f9b2f82 100644 --- a/ProjectManager/ProjectManagerHardwareVM.vb +++ b/ProjectManager/ProjectManagerHardwareVM.vb @@ -388,9 +388,9 @@ Public Class ProjectManagerHardwareVM ElseIf Map.refHardwarePageVM.CurrHardware.SaveControl() = Hardware.SaveResult.nYes Then Map.refHardwarePageVM.CurrHardware.Save() End If - End If - ' elimino il file temporaneo - Map.refHardwarePageVM.CurrHardware.DeleteTempFile() + ' elimino il file temporaneo + Map.refHardwarePageVM.CurrHardware.DeleteTempFile() + End If ' abilito DimensioningPanel Map.refDimensioningPanelVM.SetDimensioningPanel_Visibility(True) 'riporto la vista a top diff --git a/ProjectManager/ProjectManagerVM.vb b/ProjectManager/ProjectManagerVM.vb index b7e2fbf..7c23345 100644 --- a/ProjectManager/ProjectManagerVM.vb +++ b/ProjectManager/ProjectManagerVM.vb @@ -216,14 +216,14 @@ Public Class ProjectManagerVM End Sub Public Sub OpenProject(sFilePath As String) - ' verifico se selezionato esiste e modificatosrth + ' verifico se selezionato esiste e modificato If Not IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.IsModified Then Dim sText As String = String.Format(EgtMsg(50109), Path.GetFileNameWithoutExtension(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.Name)) Select Case MessageBox.Show(sText, "", MessageBoxButton.YesNoCancel, MessageBoxImage.Question) Case MessageBoxResult.Yes Map.refAssemblyManagerVM.Save(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Case MessageBoxResult.No - Map.refAssemblyManagerVM.Delete(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) + 'Map.refAssemblyManagerVM.Delete(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) Case MessageBoxResult.Cancel Return End Select