Merge branch 'master' into 3gx-master

* master: rosalina: work around gsp bug fix typo in screen filters menu
2020-07-22 19:27:49 +02:00
parent 15342b5030 738a242e3c
commit 47b5466a6e
2 changed files with 3 additions and 2 deletions
--- a/sysmodules/rosalina/source/menus/screen_filters.c
+++ b/sysmodules/rosalina/source/menus/screen_filters.c
@@ -116,7 +116,7 @@ Menu screenFiltersMenu = {
        { "[2700K] Incandescent", METHOD, .method = &ScreenFiltersMenu_SetIncandescent },
        { "[2300K] Warm Incandescent", METHOD, .method = &ScreenFiltersMenu_SetWarmIncandescent },
        { "[1900K] Candle", METHOD, .method = &ScreenFiltersMenu_SetCandle },
-        { "[2700K] Ember", METHOD, .method = &ScreenFiltersMenu_SetEmber },
+        { "[1200K] Ember", METHOD, .method = &ScreenFiltersMenu_SetEmber },
        {},
    }
 };