From cb18117c92159e1ab59b711eada97fd4712fe653 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 22 Apr 2019 16:34:42 -0700 Subject: [PATCH] Added a helper function to tell whether or not a window can be minimized --- src/video/SDL_video.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index e8a1f95cab824..a2856ddc4b134 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -2207,6 +2207,15 @@ SDL_MaximizeWindow(SDL_Window * window) } } +static SDL_bool +CanMinimizeWindow(SDL_Window * window) +{ + if (!_this->MinimizeWindow) { + return SDL_FALSE; + } + return SDL_TRUE; +} + void SDL_MinimizeWindow(SDL_Window * window) { @@ -2216,10 +2225,13 @@ SDL_MinimizeWindow(SDL_Window * window) return; } - if (_this->MinimizeWindow) { - /* Only leave fullscreen mode if we're actually going to minimize */ - SDL_UpdateFullscreenMode(window, SDL_FALSE); + if (!CanMinimizeWindow(window)) { + return; + } + SDL_UpdateFullscreenMode(window, SDL_FALSE); + + if (_this->MinimizeWindow) { _this->MinimizeWindow(_this, window); } }