Insure preferences are propagated regardless of enabled state

This commit is contained in:
Aaron Culliney
2016-04-13 21:23:37 -07:00
parent 04f22686fa
commit 65882152a8
2 changed files with 8 additions and 7 deletions
+4 -4
View File
@@ -171,6 +171,10 @@ static void alert_render(void) {
_alertToModel(message, cols, rows);
}
if (prefsChanged) {
alert_applyPrefs();
}
if (!isEnabled) {
return;
}
@@ -179,10 +183,6 @@ static void alert_render(void) {
return;
}
if (prefsChanged) {
alert_applyPrefs();
}
struct timespec now = { 0 };
clock_gettime(CLOCK_MONOTONIC, &now);
+4 -3
View File
@@ -450,12 +450,12 @@ static void gltouchmenu_render(void) {
if (!isAvailable) {
return;
}
if (!isEnabled) {
return;
}
if (UNLIKELY(menu.prefsChanged)) {
gltouchmenu_setup(); // fully set up again on prefs change
}
if (!isEnabled) {
return;
}
float alpha = glhud_getTimedVisibility(menu.timingBegin, menu.minAlpha, menu.maxAlpha);
if (alpha < menu.minAlpha) {
@@ -637,6 +637,7 @@ static void _init_gltouchmenu(void) {
});
prefs_registerListener(PREF_DOMAIN_KEYBOARD, &gltouchmenu_prefsChanged);
prefs_registerListener(PREF_DOMAIN_TOUCHSCREEN, &gltouchmenu_prefsChanged);
prefs_registerListener(PREF_DOMAIN_INTERFACE, &gltouchmenu_prefsChanged);
}