From 6eb6e817b8580715bfa80d2cd23ec6b918cc8afa Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 12 Oct 2023 17:23:02 +0200 Subject: [PATCH] modifica controllo OverwritePrompt --- Icarus/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb | 1 + Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb | 2 +- Icarus/Icarus.vbproj | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Icarus/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb b/Icarus/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb index bf2a5a5..3a76d6d 100644 --- a/Icarus/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb +++ b/Icarus/EgtManageFileDialog/EgtManageFileDialogV.xaml.vb @@ -1,4 +1,5 @@ Imports System.Windows.Forms +Imports EgtWPFLib5 Public Class EgtManageFileDialogV diff --git a/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb b/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb index 1b229a4..6b9346e 100644 --- a/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb +++ b/Icarus/EgtManageFileDialog/EgtManageFileDialogVM.vb @@ -503,7 +503,7 @@ Public Class EgtManageFileDialogVM End If Next ElseIf m_bValidateNames = False And m_bOverwritePrompt Then - If m_sFileName.Equals(m_sSaveFileName) Or m_sSaveFileName.Equals(CurrItem.sName) Then + If m_sFileName.Equals(m_sSaveFileName) OrElse m_sSaveFileName.Equals(CurrItem.sName) Then If EgtMessageBoxV.Show(Application.Current.MainWindow, EgtMsg(15073), sTitle, MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return End If diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj index a2547a5..0d4df2d 100644 --- a/Icarus/Icarus.vbproj +++ b/Icarus/Icarus.vbproj @@ -150,6 +150,7 @@ DispositionPanelV.xaml + EgtMessageBoxV.xaml @@ -160,7 +161,6 @@ EgtManageFileDialogV.xaml - FilledSolidPanelV.xaml