From e0ec68a73d2372e255338a710888b15da8828279 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 1 Dec 2015 03:03:33 +0100
Subject: [PATCH] Reduce references to global->cheat

---
 cheats.c                  | 4 +++-
 cheats.h                  | 2 +-
 menu/cbs/menu_cbs_right.c | 8 +-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/cheats.c b/cheats.c
index f49388d3f5..21acb3395b 100644
--- a/cheats.c
+++ b/cheats.c
@@ -330,8 +330,10 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
    RARCH_LOG("%s\n", msg);
 }
 
-void cheat_manager_toggle_index(cheat_manager_t *handle, unsigned i)
+void cheat_manager_toggle_index(unsigned i)
 {
+   global_t *global        = global_get_ptr();
+   cheat_manager_t *handle = global->cheat;
    if (!handle)
       return;
 
diff --git a/cheats.h b/cheats.h
index 331e174905..72f480d6cc 100644
--- a/cheats.h
+++ b/cheats.h
@@ -57,7 +57,7 @@ void cheat_manager_apply_cheats(void);
 
 void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx);
 
-void cheat_manager_toggle_index(cheat_manager_t *handle, unsigned i);
+void cheat_manager_toggle_index(unsigned i);
 
 unsigned cheat_manager_get_buf_size(void);
 
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index dd227463c7..806f2433da 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -71,13 +71,7 @@ int shader_action_parameter_preset_right(unsigned type, const char *label,
 int generic_action_cheat_toggle(size_t idx, unsigned type, const char *label,
       bool wraparound)
 {
-   global_t *global       = global_get_ptr();
-   cheat_manager_t *cheat = global->cheat;
-
-   if (!cheat)
-      return -1;
-
-   cheat_manager_toggle_index(cheat, idx);
+   cheat_manager_toggle_index(idx);
 
    return 0;
 }