UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrected issue with unclosed threads

Browse source
This commit is contained in:
raysan5 2016-06-24 19:34:47 +02:00
parent 03d9583b94
commit a522b6e23b
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/core.c
View file

@ -444,7 +444,15 @@ void CloseWindow(void)
eglTerminate(display); eglTerminate(display);
display = EGL_NO_DISPLAY; display = EGL_NO_DISPLAY;
} }
#endif
#if defined(PLATFORM_RPI)
// Wait for mouse and gamepad threads to finish before closing
// NOTE: Those threads should already have finished at this point
// because they are controlled by windowShouldClose variable
pthread_join(mouseThreadId, NULL);
pthread_join(gamepadThreadId, NULL);
#endif #endif
TraceLog(INFO, "Window closed successfully"); TraceLog(INFO, "Window closed successfully");
@ -1766,12 +1774,12 @@ static void InitGraphics(void)
ClearBackground(RAYWHITE); // Default background color for raylib games :P ClearBackground(RAYWHITE); // Default background color for raylib games :P
#if defined(PLATFORM_ANDROID) #if defined(PLATFORM_ANDROID)
windowReady = true; // IMPORTANT! windowReady = true; // IMPORTANT!
#endif #endif
} }
// Compute framebuffer size relative to screen size and display size // Compute framebuffer size relative to screen size and display size
// NOTE: Global variables renderWidth/renderHeight can be modified // NOTE: Global variables renderWidth/renderHeight and renderOffsetX/renderOffsetY can be modified
static void SetupFramebufferSize(int displayWidth, int displayHeight) static void SetupFramebufferSize(int displayWidth, int displayHeight)
{ {
// TODO: SetupFramebufferSize() does not consider properly display video modes. // TODO: SetupFramebufferSize() does not consider properly display video modes.
@ -2662,7 +2670,7 @@ static void *MouseThread(void *arg)
int mouseRelX = 0; int mouseRelX = 0;
int mouseRelY = 0; int mouseRelY = 0;
while(1) while (1)
{ {
if (read(mouseStream, &mouse, sizeof(MouseEvent)) == (int)sizeof(MouseEvent)) if (read(mouseStream, &mouse, sizeof(MouseEvent)) == (int)sizeof(MouseEvent))
{ {
@ -2752,7 +2760,7 @@ static void *GamepadThread(void *arg)
// Read gamepad event // Read gamepad event
struct js_event gamepadEvent; struct js_event gamepadEvent;
while (1) while (!windowShouldClose)
{ {
for (int i = 0; i < MAX_GAMEPADS; i++) for (int i = 0; i < MAX_GAMEPADS; i++)
{ {
@ -2787,7 +2795,7 @@ static void *GamepadThread(void *arg)
return NULL; return NULL;
} }
#endif #endif // PLATFORM_RPI
// Plays raylib logo appearing animation // Plays raylib logo appearing animation
static void LogoAnimation(void) static void LogoAnimation(void)