Skip to content
Snippets Groups Projects
Commit 20165689 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Add locking around win access

parent 099cfb35
Branches
No related tags found
No related merge requests found
...@@ -706,7 +706,9 @@ static void sdl_add_key(unsigned int keyval, struct video_stats *vs) ...@@ -706,7 +706,9 @@ static void sdl_add_key(unsigned int keyval, struct video_stats *vs)
if (keyval == 0xe0) if (keyval == 0xe0)
keyval = CIO_KEY_LITERAL_E0; keyval = CIO_KEY_LITERAL_E0;
if(keyval==0xa600 && vs != NULL) { if(keyval==0xa600 && vs != NULL) {
pthread_mutex_lock(&win_mutex);
fullscreen = !(sdl.GetWindowFlags(win) & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP)); fullscreen = !(sdl.GetWindowFlags(win) & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP));
pthread_mutex_unlock(&win_mutex);
cio_api.mode=fullscreen?CIOLIB_MODE_SDL_FULLSCREEN:CIOLIB_MODE_SDL; cio_api.mode=fullscreen?CIOLIB_MODE_SDL_FULLSCREEN:CIOLIB_MODE_SDL;
update_cvstat(vs); update_cvstat(vs);
sdl.SetWindowFullscreen(win, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0); sdl.SetWindowFullscreen(win, fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
...@@ -933,8 +935,10 @@ void sdl_video_event_thread(void *data) ...@@ -933,8 +935,10 @@ void sdl_video_event_thread(void *data)
if ((ev.key.keysym.mod & KMOD_ALT) && if ((ev.key.keysym.mod & KMOD_ALT) &&
(ev.key.keysym.sym == SDLK_LEFT || (ev.key.keysym.sym == SDLK_LEFT ||
ev.key.keysym.sym == SDLK_RIGHT)) { ev.key.keysym.sym == SDLK_RIGHT)) {
pthread_mutex_lock(&win_mutex);
if (sdl.GetWindowFlags(win) & SDL_WINDOW_MAXIMIZED) if (sdl.GetWindowFlags(win) & SDL_WINDOW_MAXIMIZED)
sdl.RestoreWindow(win); sdl.RestoreWindow(win);
pthread_mutex_unlock(&win_mutex);
int w, h; int w, h;
SDL_Rect r; SDL_Rect r;
if (sdl.GetDisplayUsableBounds(0, &r) == 0) { if (sdl.GetDisplayUsableBounds(0, &r) == 0) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment