encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sam Lantinga 2021-11-10 11:04:51 -08:00
parent dca5ce4ea3
commit 98c9836287
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/SDL_video.c
View File

@ -4271,6 +4271,8 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
if (!mbdata.message) mbdata.message = ""; if (!mbdata.message) mbdata.message = "";
messageboxdata = &mbdata; messageboxdata = &mbdata;
SDL_ClearError();
if (_this && _this->ShowMessageBox) { if (_this && _this->ShowMessageBox) {
retval = _this->ShowMessageBox(_this, messageboxdata, buttonid); retval = _this->ShowMessageBox(_this, messageboxdata, buttonid);
} }
@ -4352,8 +4354,12 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
} }
#endif #endif
if (retval == -1) { if (retval == -1) {
const char *error = SDL_GetError();
if (!*error) {
SDL_SetError("No message system available"); SDL_SetError("No message system available");
} }
}
if (current_window) { if (current_window) {
SDL_RaiseWindow(current_window); SDL_RaiseWindow(current_window);