Skip to content

Commit

Permalink
X11: Reenabled setlocale() and fork() for message boxes.
Browse files Browse the repository at this point in the history
Fixes Bugzilla #1658.
  • Loading branch information
icculus committed Mar 23, 2015
1 parent 331a434 commit c76130c
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions src/video/x11/SDL_x11messagebox.c
Expand Up @@ -31,8 +31,8 @@
#include <locale.h>


#define SDL_FORK_MESSAGEBOX 0
#define SDL_SET_LOCALE 0
#define SDL_FORK_MESSAGEBOX 1
#define SDL_SET_LOCALE 1

#if SDL_FORK_MESSAGEBOX
#include <sys/types.h>
Expand Down Expand Up @@ -718,9 +718,6 @@ X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
int fds[2];
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) {
return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */
}
Expand Down

0 comments on commit c76130c

Please sign in to comment.