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

X11: Reenabled setlocale() and fork() for message boxes. 

Fixes Bugzilla #1658.
This commit is contained in:
Ryan C. Gordon 2015-03-23 19:54:33 -04:00
parent 331a434fa1
commit c76130c9cc
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video/x11/SDL_x11messagebox.c
View File

@ -31,8 +31,8 @@
#include <locale.h> #include <locale.h>
#define SDL_FORK_MESSAGEBOX 0 #define SDL_FORK_MESSAGEBOX 1
#define SDL_SET_LOCALE 0 #define SDL_SET_LOCALE 1
#if SDL_FORK_MESSAGEBOX #if SDL_FORK_MESSAGEBOX
#include <sys/types.h> #include <sys/types.h>
@ -718,9 +718,6 @@ X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
int fds[2]; int fds[2];
int status = 0; int status = 0;
/* Need to flush here in case someone has turned grab off and it hasn't gone through yet, etc. */
X11_XFlush(data->display);
if (pipe(fds) == -1) { if (pipe(fds) == -1) {
return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */ return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */
} }