Merge pull request #28270 from meeseeksmachine/auto-backport-of-pr-28269-on-v3.9.x

timhoffm · web-flow · commit c79514aa04ac · 2024-05-22T01:50:26.000+02:00
Backport PR #28269 on branch v3.9.x (Handle GetForegroundWindow() returning NULL.)
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -44,7 +44,7 @@ def _restore_foreground_window_at_end():
     try:
         yield
     finally:
-        if mpl.rcParams['tk.window_focus']:
+        if foreground and mpl.rcParams['tk.window_focus']:
             _c_internal_utils.Win32_SetForegroundWindow(foreground)
 
 
diff --git a/src/_c_internal_utils.cpp b/src/_c_internal_utils.cpp
@@ -111,7 +111,11 @@ static py::object
 mpl_GetForegroundWindow(void)
 {
 #ifdef _WIN32
-  return py::capsule(GetForegroundWindow(), "HWND");
+  if (HWND hwnd = GetForegroundWindow()) {
+    return py::capsule(hwnd, "HWND");
+  } else {
+    return py::none();
+  }
 #else
   return py::none();
 #endif
