From 182272645281ac911954fa0a6e2df64702826c36 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 21 Oct 2016 02:52:01 +0200
Subject: [PATCH] Cleanups

---
 runloop.c | 85 +++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 47 deletions(-)

diff --git a/runloop.c b/runloop.c
index 2b890682ef..339331ccb4 100644
--- a/runloop.c
+++ b/runloop.c
@@ -273,41 +273,6 @@ static bool runloop_check_pause(
    return true;
 }
 
-/**
- * runloop_check_stateslots:
- * @pressed_increase     : is state slot increase key pressed?
- * @pressed_decrease     : is state slot decrease key pressed?
- *
- * Checks if the state increase/decrease keys have been pressed
- * for this frame.
- **/
-static void runloop_check_stateslots(settings_t *settings,
-      bool pressed_increase, bool pressed_decrease)
-{
-   char msg[128];
-
-   msg[0] = '\0';
-
-   /* Save state slots */
-   if (pressed_increase)
-      settings->state_slot++;
-   else if (pressed_decrease)
-   {
-      if (settings->state_slot > 0)
-         settings->state_slot--;
-   }
-   else
-      return;
-
-   snprintf(msg, sizeof(msg), "%s: %d",
-         msg_hash_to_str(MSG_STATE_SLOT),
-         settings->state_slot);
-
-   runloop_msg_queue_push(msg, 2, 180, true);
-
-   RARCH_LOG("%s\n", msg);
-}
-
 /**
  * rarch_game_specific_options:
  *
@@ -338,12 +303,7 @@ static bool rarch_game_specific_options(char **output)
 
 static bool runloop_check_pause_state(event_cmd_state_t *cmd)
 {
-   bool check_is_oneshot = false;
-
-   if (!cmd)
-      return false;
-
-   check_is_oneshot      = runloop_cmd_triggered(cmd,
+   bool check_is_oneshot      = runloop_cmd_triggered(cmd,
          RARCH_FRAMEADVANCE)
       || runloop_cmd_press(cmd, RARCH_REWIND);
 
@@ -368,8 +328,7 @@ static bool runloop_check_state(event_cmd_state_t *cmd)
    bool focused              = true;
    settings_t *settings      = config_get_ptr();
    
-
-   if (!cmd || runloop_idle)
+   if (runloop_idle)
       return false;
 
    if (settings->pause_nonactive)
@@ -433,10 +392,42 @@ static bool runloop_check_state(event_cmd_state_t *cmd)
       driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL);
    }
 
-   runloop_check_stateslots(settings,
-         runloop_cmd_triggered(cmd, RARCH_STATE_SLOT_PLUS),
-         runloop_cmd_triggered(cmd, RARCH_STATE_SLOT_MINUS)
-         );
+   /* Checks if the state increase/decrease keys have been pressed 
+    * for this frame. */
+
+   if (runloop_cmd_triggered(cmd, RARCH_STATE_SLOT_PLUS))
+   {
+      char msg[128];
+
+      msg[0] = '\0';
+
+      settings->state_slot++;
+
+      snprintf(msg, sizeof(msg), "%s: %d",
+            msg_hash_to_str(MSG_STATE_SLOT),
+            settings->state_slot);
+
+      runloop_msg_queue_push(msg, 2, 180, true);
+
+      RARCH_LOG("%s\n", msg);
+   }
+   else if (runloop_cmd_triggered(cmd, RARCH_STATE_SLOT_MINUS))
+   {
+      char msg[128];
+
+      msg[0] = '\0';
+
+      if (settings->state_slot > 0)
+         settings->state_slot--;
+
+      snprintf(msg, sizeof(msg), "%s: %d",
+            msg_hash_to_str(MSG_STATE_SLOT),
+            settings->state_slot);
+
+      runloop_msg_queue_push(msg, 2, 180, true);
+
+      RARCH_LOG("%s\n", msg);
+   }
 
    if (runloop_cmd_triggered(cmd, RARCH_SAVE_STATE_KEY))
       command_event(CMD_EVENT_SAVE_STATE, NULL);