From d9bf45d2e76e430c096d26dc6479ba2547c71541 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 2 Jul 2016 07:22:06 +0200
Subject: [PATCH] Cleanups

---
 menu/cbs/menu_cbs_cancel.c | 19 +++++++++----------
 menu/menu_cbs.c            |  2 +-
 menu/menu_cbs.h            |  3 +--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c
index dcd9474187..eb5c0692e4 100644
--- a/menu/cbs/menu_cbs_cancel.c
+++ b/menu/cbs/menu_cbs_cancel.c
@@ -48,26 +48,25 @@ static int action_cancel_core_content(const char *path,
 }
 
 static int menu_cbs_init_bind_cancel_compare_label(menu_file_list_cbs_t *cbs,
-      const char *label, const char *menu_label)
+      const char *label)
 {
-   if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST)))
-   {
-      BIND_ACTION_CANCEL(cbs, action_cancel_core_content);
-      return 0;
-   }
-
    return -1;
 }
 
 static int menu_cbs_init_bind_cancel_compare_type(
       menu_file_list_cbs_t *cbs, unsigned type)
 {
+   switch (type)
+   {
+      case FILE_TYPE_DOWNLOAD_CORE_CONTENT:
+         BIND_ACTION_CANCEL(cbs, action_cancel_core_content);
+         return 0;
+   }
    return -1;
 }
 
 int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
-      const char *path, const char *label, unsigned type, size_t idx,
-      const char *menu_label)
+      const char *path, const char *label, unsigned type, size_t idx)
 {
    if (!cbs)
       return -1;
@@ -75,7 +74,7 @@ int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
 
    BIND_ACTION_CANCEL(cbs, action_cancel_pop_default);
 
-   if (menu_cbs_init_bind_cancel_compare_label(cbs, label, menu_label) == 0)
+   if (menu_cbs_init_bind_cancel_compare_label(cbs, label) == 0)
       return 0;
 
    if (menu_cbs_init_bind_cancel_compare_type(
diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c
index a2ab93ed24..a142816eeb 100644
--- a/menu/menu_cbs.c
+++ b/menu/menu_cbs.c
@@ -70,7 +70,7 @@ void menu_cbs_init(void *data,
 
    menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident);
 
-   menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label);
+   menu_cbs_init_bind_cancel(cbs, path, label, type, idx);
 
    menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident);
 
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 680fcedacc..8aeadbf75c 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -148,8 +148,7 @@ int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx);
 
 int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
-      const char *path, const char *label, unsigned type, size_t idx,
-      const char *menu_label);
+      const char *path, const char *label, unsigned type, size_t idx);
 
 int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,