Fix xtreme_settings fetch

This commit is contained in:
Willy-JL
2023-01-18 10:46:25 +00:00
parent e6daceb1ff
commit 3302613ec5
9 changed files with 21 additions and 21 deletions

View File

@@ -200,12 +200,12 @@ static void animation_manager_start_new_idle(AnimationManager* animation_manager
const BubbleAnimation* bubble_animation =
animation_storage_get_bubble_animation(animation_manager->current_animation);
animation_manager->state = AnimationManagerStateIdle;
XtremeSettings* xtreme = XTREME_SETTINGS();
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
int32_t duration = 0;
if (xtreme->cycle_anims == 0) {
if (xtreme_settings->cycle_anims == 0) {
duration = bubble_animation->duration;
} else if (xtreme->cycle_anims != -1) {
duration = xtreme->cycle_anims;
} else if (xtreme_settings->cycle_anims != -1) {
duration = xtreme_settings->cycle_anims;
}
furi_timer_start(animation_manager->idle_animation_timer, duration * 1000);
}
@@ -521,12 +521,12 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m
} else {
const BubbleAnimation* bubble_animation = animation_storage_get_bubble_animation(
animation_manager->current_animation);
XtremeSettings* xtreme = XTREME_SETTINGS();
XtremeSettings* xtreme_settings = XTREME_SETTINGS();
int32_t duration = 0;
if (xtreme->cycle_anims == 0) {
if (xtreme_settings->cycle_anims == 0) {
duration = bubble_animation->duration;
} else if (xtreme->cycle_anims != -1) {
duration = xtreme->cycle_anims;
} else if (xtreme_settings->cycle_anims != -1) {
duration = xtreme_settings->cycle_anims;
}
furi_timer_start(
animation_manager->idle_animation_timer, duration * 1000);