Merge pull request #5005 from libretro/revert-4985-master

Revert "xmb: allow transparency when emulation paused"
This commit is contained in:
Twinaphex 2017-06-01 00:28:01 +02:00 committed by GitHub
commit 03160ed3fc
1 changed files with 3 additions and 2 deletions

View File

@ -2502,6 +2502,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
video_info->xmb_alpha_factor = settings->uints.menu_xmb_alpha_factor; video_info->xmb_alpha_factor = settings->uints.menu_xmb_alpha_factor;
video_info->menu_wallpaper_opacity = settings->floats.menu_wallpaper_opacity; video_info->menu_wallpaper_opacity = settings->floats.menu_wallpaper_opacity;
if (!settings->bools.menu_pause_libretro)
video_info->libretro_running = (rarch_ctl(RARCH_CTL_IS_INITED, NULL) video_info->libretro_running = (rarch_ctl(RARCH_CTL_IS_INITED, NULL)
&& !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)); && !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL));
#else #else