Merge pull request #393 from Noisrev/master

Add Null check for GetWindowChrome
Dirkster99 · Nov 4, 2022 · 3ddbf2f · 3ddbf2f
2 parents d0bbe39 + e77aaaf
commit 3ddbf2f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
@@ -256,8 +256,12 @@ protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, Int
 				case Win32Helper.WM_NCRBUTTONUP:
 					if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
 					{
-						if (OpenContextMenu()) handled = true;
-						WindowChrome.GetWindowChrome(this).ShowSystemMenu = _model.Root.Manager.ShowSystemMenu && !handled;
+						var windowChrome = WindowChrome.GetWindowChrome(this);
+						if (windowChrome != null)
+						{
+							if (OpenContextMenu()) handled = true;
+							windowChrome.ShowSystemMenu = _model.Root.Manager.ShowSystemMenu && !handled;
+						}
 					}
 					break;
 			}

diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
@@ -135,12 +135,17 @@ protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, Int
 				case Win32Helper.WM_NCRBUTTONUP:
 					if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
 					{
-						if (OpenContextMenu())
-							handled = true;
-						if (_model.Root.Manager.ShowSystemMenu)
-							WindowChrome.GetWindowChrome(this).ShowSystemMenu = !handled;
-						else
-							WindowChrome.GetWindowChrome(this).ShowSystemMenu = false;
+						var windowChrome = WindowChrome.GetWindowChrome(this);
+						if (windowChrome != null)
+						{
+							if (OpenContextMenu())
+								handled = true;
+
+							if (_model.Root.Manager.ShowSystemMenu)
+								windowChrome.ShowSystemMenu = !handled;
+							else
+								windowChrome.ShowSystemMenu = false;
+						}
 					}
 					break;