b/304584429 Fall back to using process main window handle as parent (#…

…1150) When no handle is provided, use the process main window handle as parent for error dialogs. This fixes an issue where the authorize dialog, after a reauth, registered itself as the default error window parent but was subsequently disposed.
GoogleCloudPlatform · Oct 10, 2023 · 98c609a · 98c609a
1 parent 0182d62
commit 98c609a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 32 deletions.
diff --git a/sources/Google.Solutions.IapDesktop.Application/Windows/Auth/AuthorizeView.cs b/sources/Google.Solutions.IapDesktop.Application/Windows/Auth/AuthorizeView.cs
@@ -55,12 +55,6 @@ public AuthorizeView()
 
         public void Bind(AuthorizeViewModel viewModel, IBindingContext bindingContext)
         {
-            //
-            // Register this window with the binding context so that any
-            // error dialos can use this window as owner.
-            //
-            ((ViewBindingContext)bindingContext).SetCurrentMainWindow(this);
-
             //
             // Bind controls.
             //

diff --git a/sources/Google.Solutions.IapDesktop.Application/Windows/ViewBindingContext.cs b/sources/Google.Solutions.IapDesktop.Application/Windows/ViewBindingContext.cs
@@ -36,23 +36,16 @@ namespace Google.Solutions.IapDesktop.Application.Windows
     public class ViewBindingContext : IBindingContext
     {
         private readonly IExceptionDialog exceptionDialog;
-        private IWin32Window errorReportingOwner;
 
-        /// <summary>
-        /// Sets the current main window that can be used as parent
-        /// for any error messages.
-        /// 
-        /// NB. During startup, we have a different main window than
-        /// later.
-        /// </summary>
-        public void SetCurrentMainWindow(IWin32Window owner)
+        public ViewBindingContext(IExceptionDialog exceptionDialog)
         {
-            this.errorReportingOwner = owner;
+            this.exceptionDialog = exceptionDialog.ExpectNotNull(nameof(exceptionDialog));
         }
 
-        public ViewBindingContext(IExceptionDialog exceptionDialog)
+        private IWin32Window GetMainWindow()
         {
-            this.exceptionDialog = exceptionDialog.ExpectNotNull(nameof(exceptionDialog));
+            var mainWindowHwnd = Process.GetCurrentProcess().MainWindowHandle;
+            return mainWindowHwnd == IntPtr.Zero ? null : new Win32Window(mainWindowHwnd);
         }
 
         //---------------------------------------------------------------------
@@ -61,7 +54,6 @@ public ViewBindingContext(IExceptionDialog exceptionDialog)
 
         public void OnBindingCreated(IComponent control, IDisposable binding)
         {
-            Debug.Assert(this.errorReportingOwner != null);
             Debug.WriteLine($"Binding added for {control.GetType().Name} ({control})");
         }
 
@@ -70,13 +62,12 @@ public void OnCommandFailed(
             ICommand command,
             Exception exception)
         {
-            Debug.Assert(this.errorReportingOwner != null);
-
             //
-            // NB. We might not know the parent window if this is
-            // a menu command. 
+            // NB. window might be null. If so, try to use the main
+            // window as parent. This is typically the main form,
+            // but could also be the authorize dialog.
             //
-            var parent = window ?? this.errorReportingOwner;
+            var parent = window ?? GetMainWindow();
 
             ApplicationEventSource.Log.CommandFailed(
                 command.Id,
@@ -96,5 +87,19 @@ public void OnCommandExecuted(ICommand command)
                 ApplicationEventSource.Log.CommandExecuted(command.Id);
             }
         }
+
+        //---------------------------------------------------------------------
+        // Inner classes.
+        //---------------------------------------------------------------------
+
+        private class Win32Window : IWin32Window
+        {
+            public Win32Window(IntPtr handle)
+            {
+                this.Handle = handle;
+            }
+
+            public IntPtr Handle { get; }
+        }
     }
 }
diff --git a/sources/Google.Solutions.IapDesktop/Properties/launchSettings.json b/sources/Google.Solutions.IapDesktop/Properties/launchSettings.json
@@ -1,8 +1,7 @@
 {
   "profiles": {
     "Google.Solutions.IapDesktop": {
-      "commandName": "Project",
-      "commandLineArgs": "/profile \"Marge BYOID\""
+      "commandName": "Project"
     }
   }
 }
diff --git a/sources/Google.Solutions.IapDesktop/Windows/MainForm.cs b/sources/Google.Solutions.IapDesktop/Windows/MainForm.cs
@@ -94,12 +94,6 @@ public MainForm(IServiceProvider serviceProvider)
             this.applicationSettings = this.serviceProvider.GetService<IRepository<IApplicationSettings>>();
             this.bindingContext = serviceProvider.GetService<IBindingContext>();
 
-            //
-            // Register this window with the binding context so that any
-            // error dialogs can use this window as owner.
-            //
-            ((ViewBindingContext)this.bindingContext).SetCurrentMainWindow(this);
-
             // 
             // Restore window settings.
             //