mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-23 14:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't generate SDL events on Atlas shutdown

Browse Source 
WX may still generate mouse events after calling CVideoMode::Shutdown(),
so don't create SDL events triggering assertions.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2026-07-14 15:17:21 +02:00
parent 63629195ba
commit 6244d25f90
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
+12
View File
@@ -118,6 +118,9 @@ MESSAGEHANDLER(GuiSwitchPage)
MESSAGEHANDLER(GuiMouseButtonEvent)
{
if (!g_VideoMode.IsInitialized())
return;
SDL_Event ev{};
ev.type = msg->pressed ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
ev.button.button = msg->button;
@@ -132,6 +135,9 @@ MESSAGEHANDLER(GuiMouseButtonEvent)
MESSAGEHANDLER(GuiMouseMotionEvent)
{
if (!g_VideoMode.IsInitialized())
return;
SDL_Event ev{};
ev.type = SDL_MOUSEMOTION;
float x, y;
@@ -143,6 +149,9 @@ MESSAGEHANDLER(GuiMouseMotionEvent)
MESSAGEHANDLER(GuiKeyEvent)
{
if (!g_VideoMode.IsInitialized())
return;
SDL_Event ev{};
ev.type = msg->pressed ? SDL_KEYDOWN : SDL_KEYUP;
ev.key.keysym.sym = static_cast<SDL_Keycode>(static_cast<int>(msg->sdlkey));
@@ -152,6 +161,9 @@ MESSAGEHANDLER(GuiKeyEvent)
MESSAGEHANDLER(GuiCharEvent)
{
if (!g_VideoMode.IsInitialized())
return;
// Simulate special 'text input' events in the SDL
// This isn't quite compatible with WXWidget's handling,
// so to avoid trouble we only send 'letter-like' ASCII input.