Skip to content

Handle GetForegroundWindow() returning NULL. #28269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuLogic merged 1 commit into from
May 21, 2024
Merged

Handle GetForegroundWindow() returning NULL. #28269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/matplotlib/backends/_backend_tk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
6 changes: 5 additions & 1 deletion src/_c_internal_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down