RepoMirrors
/
scrcpy
mirror of https://github.com/Genymobile/scrcpy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly clean up on exit 

The SDL clean up does not crash anymore on exit, probably since the
memory corruption caused by calling SDLNet_TCP_Close() too early has
been resolved.
This commit is contained in:
Romain Vimont 2018-02-09 15:20:03 +01:00
parent eb09fefd43
commit 0fce4f95b9
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/screen.c
View File

@ -15,9 +15,7 @@ SDL_bool sdl_init_and_configure(void) {
return SDL_FALSE; return SDL_FALSE;
} }
// FIXME it may crash in SDL_Quit in i965_dri.so atexit(SDL_Quit);
// As a workaround, do not call SDL_Quit() (we are exiting anyway).
// atexit(SDL_Quit);
// Bilinear resizing // Bilinear resizing
if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1")) { if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1")) {
@ -187,15 +185,10 @@ void screen_destroy(struct screen *screen) {
SDL_DestroyTexture(screen->texture); SDL_DestroyTexture(screen->texture);
} }
if (screen->renderer) { if (screen->renderer) {
// FIXME it may crash at exit if we destroy the renderer or the window, SDL_DestroyRenderer(screen->renderer);
// with the exact same stack trace as <https://bugs.launchpad.net/mir/+bug/1466535>.
// As a workaround, leak the renderer and the window (we are exiting anyway).
//SDL_DestroyRenderer(screen->renderer);
} }
if (screen->window) { if (screen->window) {
//SDL_DestroyWindow(screen->window); SDL_DestroyWindow(screen->window);
// at least we hide it
SDL_HideWindow(screen->window);
} }
} }