kmx git

Commit 98c983628726359ee2ccb9053b394fb0e04dbb8f

2021-11-10T11:04:51

Don't clobber the error in SDL_ShowMessageBox() if one has been set at the platform level Fixes https://github.com/libsdl-org/SDL/issues/4760

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index af9302b..4404d96 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -4271,6 +4271,8 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
     if (!mbdata.message) mbdata.message = "";
     messageboxdata = &mbdata;
 
+    SDL_ClearError();
+
     if (_this && _this->ShowMessageBox) {
         retval = _this->ShowMessageBox(_this, messageboxdata, buttonid);
     }
@@ -4352,7 +4354,11 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
     }
 #endif
     if (retval == -1) {
-        SDL_SetError("No message system available");
+        const char *error = SDL_GetError();
+
+        if (!*error) {
+            SDL_SetError("No message system available");
+        }
     }
 
     if (current_window) {

kc3-lang/SDL

Commit 98c983628726359ee2ccb9053b394fb0e04dbb8f