Wii U: Fix ProcUI cleanup for shutdown. (#117)

Co-authored-by: Daniel K. O. (dkosmari) <none@none>

Author: 2 people

src/video/wiiu/SDL_wiiuvideo.c

@@ -292,9 +292,9 @@ static void WIIU_VideoQuit(_THIS)
 	WIIU_VideoData *videodata = (WIIU_VideoData *) _this->driverdata;
 
 	if (videodata->handleProcUI) {
-		// Put ProcUI into EXIT/shutdown state if user stopped processing events
+		// Put ProcUI into EXIT state if user stopped processing events
 		// before SDL_QUIT was generated.
-		if (ProcUIIsRunning() && !ProcUIInShutdown()) {
+		if (ProcUIIsRunning() && !videodata->exitingProcUI) {
 			SDL_bool procui_running = SDL_TRUE;
 			SYSLaunchMenu();
 			while (procui_running) {
@@ -366,15 +366,15 @@ static void WIIU_PumpEvents(_THIS)
 {
 	WIIU_VideoData *videodata = (WIIU_VideoData *) _this->driverdata;
 
-	if (videodata->handleProcUI && !ProcUIInShutdown()) {
+	if (videodata->handleProcUI) {
 		if (videodata->enteringBackground) {
 			// The previous ProcUIProcessMessages() received a
 			// PROCUI_STATUS_RELEASE_FOREGROUND.
 			videodata->enteringBackground = SDL_FALSE;
 			ProcUIDrawDoneRelease();
 		}
 
-		if (ProcUIIsRunning() && !ProcUIInShutdown()) {
+		if (ProcUIIsRunning() && !videodata->exitingProcUI) {
 			ProcUIStatus status = ProcUIProcessMessages(TRUE);
 			switch (status) {
 			case PROCUI_STATUS_IN_FOREGROUND:
@@ -383,7 +383,7 @@ static void WIIU_PumpEvents(_THIS)
 			case PROCUI_STATUS_IN_BACKGROUND:
 				break;
 			case PROCUI_STATUS_RELEASE_FOREGROUND: {
-				SDL_Window* window = _this->windows;
+				SDL_Window *window = _this->windows;
 				while (window) {
 					// No longer in foreground, window is no longer
 					// visible.
@@ -400,6 +400,7 @@ static void WIIU_PumpEvents(_THIS)
 				break;
 			}
 			case PROCUI_STATUS_EXITING:
+				videodata->exitingProcUI = SDL_TRUE;
 				SDL_SendQuit();
 				break;
 			}

src/video/wiiu/SDL_wiiuvideo.h

@@ -39,6 +39,8 @@ struct WIIU_VideoData
 
 	SDL_bool hasForeground;
 	SDL_bool enteringBackground;
+	// indicate if ProcUI received PROCUI_STATUS_EXITING
+	SDL_bool exitingProcUI;
 
 	void *commandBufferPool;