From c73d13d4bc4066c484c0639c9b8316c43ede1088 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 14 Oct 2018 08:40:00 +0200 Subject: [PATCH] Don't use video_context_driver_check_window anymore - go call it directly --- gfx/drivers/gl.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index bf23195a58..860df2c31a 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -2019,31 +2019,26 @@ error: static bool gl_alive(void *data) { - gfx_ctx_size_t size_data; unsigned temp_width = 0; unsigned temp_height = 0; bool ret = false; bool quit = false; bool resize = false; gl_t *gl = (gl_t*)data; + bool is_shutdown = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL); /* Needed because some context drivers don't track their sizes */ video_driver_get_size(&temp_width, &temp_height); - size_data.quit = &quit; - size_data.resize = &resize; - size_data.width = &temp_width; - size_data.height = &temp_height; + gl->ctx_driver->check_window(gl->ctx_data, + &quit, &resize, &temp_width, &temp_height, is_shutdown); - if (video_context_driver_check_window(&size_data)) - { - if (quit) - gl->quitting = true; - else if (resize) - gl->should_resize = true; + if (quit) + gl->quitting = true; + else if (resize) + gl->should_resize = true; - ret = !gl->quitting; - } + ret = !gl->quitting; if (temp_width != 0 && temp_height != 0) video_driver_set_size(&temp_width, &temp_height);