From fdf17808e03ed1155bce0341bb86316b70580b57 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 11 Dec 2015 12:00:49 +0100
Subject: [PATCH] Create MENU_ANIMATION_CTL_DEINIT

---
 menu/menu_animation.c | 5 ++++-
 menu/menu_animation.h | 3 +--
 menu/menu_display.c   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index f3a21ab2be..f9b38c233f 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -375,7 +375,7 @@ static void menu_animation_push_internal(menu_animation_t *anim, const struct tw
    *target = *t;
 }
 
-void menu_animation_free(void)
+static void menu_animation_free(void)
 {
    size_t i;
    menu_animation_t *anim = menu_animation_get_ptr();
@@ -632,6 +632,9 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
 
    switch (state)
    {
+      case MENU_ANIMATION_CTL_DEINIT:
+         menu_animation_free();
+         break;
       case MENU_ANIMATION_CTL_IS_ACTIVE:
          return anim->is_active;
       case MENU_ANIMATION_CTL_CLEAR_ACTIVE:
diff --git a/menu/menu_animation.h b/menu/menu_animation.h
index fca72acc57..30e346973b 100644
--- a/menu/menu_animation.h
+++ b/menu/menu_animation.h
@@ -35,6 +35,7 @@ typedef void  (*tween_cb)  (void);
 enum menu_animation_ctl_state
 {
    MENU_ANIMATION_CTL_IS_ACTIVE = 0,
+   MENU_ANIMATION_CTL_DEINIT,
    MENU_ANIMATION_CTL_CLEAR_ACTIVE,
    MENU_ANIMATION_CTL_SET_ACTIVE,
    MENU_ANIMATION_CTL_DELTA_TIME,
@@ -88,8 +89,6 @@ enum menu_animation_easing_type
    EASING_OUT_IN_BOUNCE
 };
 
-void menu_animation_free(void);
-
 void menu_animation_kill_by_subject(size_t count, const void *subjects);
 
 void menu_animation_kill_by_tag(int tag);
diff --git a/menu/menu_display.c b/menu/menu_display.c
index a7b3149b13..158e1495a6 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -113,7 +113,7 @@ void menu_display_free(void)
       msg_queue_free(disp->msg_queue);
    disp->msg_queue = NULL;
 
-   menu_animation_free();
+   menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
 
    menu_display_fb_free(&frame_buf_state);
    memset(&frame_buf_state,    0, sizeof(menu_framebuf_t));