From 9d2d6ccb4d6ce63becbca4ce71ffd36b47f070c8 Mon Sep 17 00:00:00 2001
From: lihanbo <lihanbo@sinvo.cn>
Date: Fri, 24 Jan 2025 11:25:44 +0800
Subject: [PATCH] =?UTF-8?q?105040=20Fix=20=E4=BF=AE=E5=A4=8D=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E5=B8=83=E7=BA=BF=E6=97=B6=E6=9C=AA=E8=83=BD=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E5=BC=80=E5=90=AF=E5=B8=83=E7=BA=BF=E5=8A=A9=E6=89=8B?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/LectotypeWindow.xaml.cs              | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
index 0f66d75..b4f6645 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
@@ -398,20 +398,27 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
             { 
                 CloseBefore(() =>
                 {
-                    ViewModel.ClearNotSavedLectotypeList();
-                    var motorFlags = ViewModel.Motors.Where(motor => !motor.IsError).Select(motor => motor.GetUniqueFlag()).ToList();
-                    var window = new LayoutHelperWindow(motorFlags);
-                    //window.MotorIds = motorIds;
-                    ElementHost.EnableModelessKeyboardInterop(window);
-                    var mainApp = BaseApp.ActiveApplication;
-                    var helper = new System.Windows.Interop.WindowInteropHelper(window);
-                    helper.Owner = mainApp.Handle;
-                    window.Show();
-                    this.Close();
+                    ToLayout();
                 });
             }
+            else
+            {
+                ToLayout();
+            }
          
         }
+        private void ToLayout()
+        {
+            ViewModel.ClearNotSavedLectotypeList(); 
+            var window = new LayoutHelperWindow(ViewModel.Motors);
+            //window.MotorIds = motorIds;
+            ElementHost.EnableModelessKeyboardInterop(window);
+            var mainApp = BaseApp.ActiveApplication;
+            var helper = new System.Windows.Interop.WindowInteropHelper(window);
+            helper.Owner = mainApp.Handle;
+            window.Show();
+            this.Close();
+        }
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             if(ViewModel.GetNotSavedLectotypeList() != null && ViewModel.GetNotSavedLectotypeList().Any())