Use SDL_QuitSubSystem instead of SDL_Quit.

Fixes use-after-frees if FAudio quits after ProgramExit is called
FNA-XNA · Oct 8, 2024 · 23cba66 · 23cba66
1 parent 310e980
commit 23cba66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/FNAPlatform/SDL2_FNAPlatform.cs b/src/FNAPlatform/SDL2_FNAPlatform.cs
@@ -384,7 +384,10 @@ public static void ProgramExit(object sender, EventArgs e)
 			Media.MediaPlayer.DisposeIfNecessary();
 
 			// This _should_ be the last SDL call we make...
-			SDL.SDL_Quit();
+			SDL.SDL_QuitSubSystem(
+				SDL.SDL_INIT_VIDEO |
+				SDL.SDL_INIT_GAMECONTROLLER
+			);
 		}
 
 		#endregion

diff --git a/src/FNAPlatform/SDL3_FNAPlatform.cs b/src/FNAPlatform/SDL3_FNAPlatform.cs
@@ -289,7 +289,10 @@ public static void ProgramExit(object sender, EventArgs e)
 			Media.MediaPlayer.DisposeIfNecessary();
 
 			// This _should_ be the last SDL call we make...
-			SDL.SDL_Quit();
+			SDL.SDL_QuitSubSystem(
+				SDL.SDL_InitFlags.SDL_INIT_VIDEO |
+				SDL.SDL_InitFlags.SDL_INIT_GAMEPAD
+			);
 		}
 
 		#endregion