mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-02 04:22:34 +02:00
Code Issues Projects Releases Wiki Activity

Fix crash on exit when using nvidia-460 + SDL with EGL support

Browse Source
This commit is contained in:
Tamás Bálint Misius
2021-04-06 20:03:48 +02:00
parent 4e5527ce97
commit b98c9c8a2e
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/PowderToyFontEditor.cpp
View File

@@ -515,6 +515,17 @@ int main(int argc, char * argv[])
ui::Engine::Ref().CloseWindow(); ui::Engine::Ref().CloseWindow();
delete gameController; delete gameController;
delete ui::Engine::Ref().g; delete ui::Engine::Ref().g;
if (SDL_GetWindowFlags(sdl_window) & SDL_WINDOW_OPENGL)
{
// * nvidia-460 egl registers callbacks with x11 that end up being called
// after egl is unloaded unless we grab it here and release it after
// sdl closes the display. this is an nvidia driver weirdness but
// technically an sdl bug. glfw has this fixed:
// https://github.com/glfw/glfw/commit/9e6c0c747be838d1f3dc38c2924a47a42416c081
SDL_GL_LoadLibrary(NULL);
SDL_QuitSubSystem(SDL_INIT_VIDEO);
SDL_GL_UnloadLibrary();
}
SDL_Quit(); SDL_Quit();
return 0; return 0;
} }

11
src/PowderToySDL.cpp
View File

@@ -1000,6 +1000,17 @@ int main(int argc, char * argv[])
delete gameController; delete gameController;
delete ui::Engine::Ref().g; delete ui::Engine::Ref().g;
Client::Ref().Shutdown(); Client::Ref().Shutdown();
if (SDL_GetWindowFlags(sdl_window) & SDL_WINDOW_OPENGL)
{
// * nvidia-460 egl registers callbacks with x11 that end up being called
// after egl is unloaded unless we grab it here and release it after
// sdl closes the display. this is an nvidia driver weirdness but
// technically an sdl bug. glfw has this fixed:
// https://github.com/glfw/glfw/commit/9e6c0c747be838d1f3dc38c2924a47a42416c081
SDL_GL_LoadLibrary(NULL);
SDL_QuitSubSystem(SDL_INIT_VIDEO);
SDL_GL_UnloadLibrary();
}
SDL_Quit(); SDL_Quit();
return 0; return 0;
} }