From f5f982afab939cc1870b796aadc849b3e481415b Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Mon, 1 Jul 2024 14:20:44 +0200 Subject: [PATCH] =?UTF-8?q?Detail=20Fenster=20schlie=C3=9Ft=20bei=20automa?= =?UTF-8?q?tischem=20Logout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/BeWoApp.xaml.cs | 9 +++++---- BeWo/View/BeWoWindowBuilder.cs | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 56ac2d87c..2b7a49f0d 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -855,9 +855,6 @@ namespace BeWo { if (MainControl != null) { - - - MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() => { UserControl exControl = null; @@ -1158,7 +1155,11 @@ namespace BeWo { abc.Close(); } - } + else if (abc.Title.IndexOf("Popup") >= 0) + { + abc.Close(); + } + } MainControl.HideCurrentModalViewWindows(); diff --git a/BeWo/View/BeWoWindowBuilder.cs b/BeWo/View/BeWoWindowBuilder.cs index c4f934be4..4ded5d01a 100644 --- a/BeWo/View/BeWoWindowBuilder.cs +++ b/BeWo/View/BeWoWindowBuilder.cs @@ -72,6 +72,7 @@ namespace BeWo.View beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner; beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow; + beWoWindow.Title = "Popup"; beWoWindow.rootGroupBox.Header = title; return beWoWindow;