Don't completely reinit menu driver unless we're killing Rarch.
This commit is contained in:
parent
ea49c5ecae
commit
206ea8012f
3
driver.c
3
driver.c
|
@ -535,7 +535,8 @@ void init_drivers(void)
|
||||||
driver.osk_data_own = false;
|
driver.osk_data_own = false;
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
driver.menu_data_own = false;
|
// By default, we want the menu to persist through driver reinits.
|
||||||
|
driver.menu_data_own = true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
adjust_system_rates();
|
adjust_system_rates();
|
||||||
|
|
|
@ -258,7 +258,10 @@ void main_exit(args_type() args)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_extern.main_is_init)
|
if (g_extern.main_is_init)
|
||||||
|
{
|
||||||
|
driver.menu_data_own = false; // Do not want menu context to live any more.
|
||||||
rarch_main_deinit();
|
rarch_main_deinit();
|
||||||
|
}
|
||||||
rarch_deinit_msg_queue();
|
rarch_deinit_msg_queue();
|
||||||
|
|
||||||
#ifdef PERF_TEST
|
#ifdef PERF_TEST
|
||||||
|
|
|
@ -1963,10 +1963,6 @@ static void check_savestates(bool immutable)
|
||||||
|
|
||||||
void rarch_set_fullscreen(bool fullscreen)
|
void rarch_set_fullscreen(bool fullscreen)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_MENU
|
|
||||||
driver.menu_data_own = true; // Don't reinit menu for something trivial.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
g_settings.video.fullscreen = fullscreen;
|
g_settings.video.fullscreen = fullscreen;
|
||||||
driver.video_cache_context = g_extern.system.hw_render_callback.cache_context;
|
driver.video_cache_context = g_extern.system.hw_render_callback.cache_context;
|
||||||
driver.video_cache_context_ack = false;
|
driver.video_cache_context_ack = false;
|
||||||
|
@ -1977,10 +1973,6 @@ void rarch_set_fullscreen(bool fullscreen)
|
||||||
// Poll input to avoid possibly stale data to corrupt things.
|
// Poll input to avoid possibly stale data to corrupt things.
|
||||||
if (driver.input)
|
if (driver.input)
|
||||||
input_poll_func();
|
input_poll_func();
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
|
||||||
driver.menu_data_own = false;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool rarch_check_fullscreen(void)
|
bool rarch_check_fullscreen(void)
|
||||||
|
|
Loading…
Reference in New Issue