Merge pull request #12355 from jdgleaver/3ds-disable-screensaver

(3DS) Disable menu screensaver animations in XMB/GLUI
This commit is contained in:
Autechre 2021-05-04 16:04:24 +02:00 committed by GitHub
commit 7fbb7a8007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View File

@ -413,6 +413,12 @@ static bool menu_screensaver_update_state(
{
bool init_effect = false;
#if defined(_3DS)
/* 3DS has an 'incomplete' font driver,
* and cannot render screensaver effects */
effect = MENU_SCREENSAVER_BLANK;
#endif
/* Check if dimensions have changed */
if ((screensaver->last_width != width) ||
(screensaver->last_height != height))

View File

@ -14383,7 +14383,7 @@ static bool setting_append_list(
&setting_get_string_representation_uint_menu_screensaver_timeout;
menu_settings_list_current_add_range(list, list_info, 0, 1800, 10, true, true);
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
#if (defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)) && !defined(_3DS)
if (string_is_equal(settings->arrays.menu_driver, "glui") ||
string_is_equal(settings->arrays.menu_driver, "xmb") ||
string_is_equal(settings->arrays.menu_driver, "ozone"))