alternative PR#11

mitchleung · Feb 26, 2019 · 1b6a63e · 1b6a63e
1 parent f67fe96
commit 1b6a63e
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/BasiliskII/src/SDL/video_sdl2.cpp b/BasiliskII/src/SDL/video_sdl2.cpp
@@ -875,25 +875,24 @@ static int present_sdl_video()
 	SDL_SetRenderDrawColor(sdl_renderer, 0, 0, 0, 0);	// Use black
 	SDL_RenderClear(sdl_renderer);						// Clear the display
 
-    // We're about to work with sdl_update_video_rect, so stop other threads from
-    // modifying it!
-    SDL_LockMutex(sdl_update_video_mutex);
-
     // Convert from the guest OS' pixel format, to the host OS' texture, if necessary.
     if (host_surface != guest_surface &&
 		host_surface != NULL &&
 		guest_surface != NULL)
 	{
 		SDL_Rect destRect = sdl_update_video_rect;
 		LOCK_PALETTE;
+		SDL_LockMutex(sdl_update_video_mutex);
 		int result = SDL_BlitSurface(guest_surface, &sdl_update_video_rect, host_surface, &destRect);
+		SDL_UnlockMutex(sdl_update_video_mutex);
 		UNLOCK_PALETTE;
-		if (result != 0) {
-            SDL_UnlockMutex(sdl_update_video_mutex);
-			return -1;
-		}
+		if (result != 0) return -1;
 	}
 
+	// We're about to work with sdl_update_video_rect, so stop other threads from
+	// modifying it!
+	SDL_LockMutex(sdl_update_video_mutex);
+
     // Update the host OS' texture
     void * srcPixels = (void *)((uint8_t *)host_surface->pixels +
         sdl_update_video_rect.y * host_surface->pitch +