From 3555fc1d02ce6948acc47a8cc3b9e7287999ef6a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 1 Dec 2015 03:51:34 +0100
Subject: [PATCH] Cleanups

---
 runloop.c | 12 ++++++------
 runloop.h |  5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/runloop.c b/runloop.c
index 7de6454fac..a4412bf891 100644
--- a/runloop.c
+++ b/runloop.c
@@ -61,6 +61,7 @@
 
 static struct global g_extern;
 
+static unsigned runloop_pending_windowed_scale;
 static char runloop_fullpath[PATH_MAX_LENGTH];
 static bool runloop_perfcnt_enable;
 static bool main_exec;
@@ -300,14 +301,14 @@ static void check_stateslots(settings_t *settings,
  *
  * Will also immediately apply the shader.
  **/
-static void check_shader_dir(global_t *global,
-      bool pressed_next, bool pressed_prev)
+static void check_shader_dir(bool pressed_next, bool pressed_prev)
 {
    uint32_t ext_hash;
    char msg[PATH_MAX_LENGTH];
    const char *shader          = NULL;
    const char *ext             = NULL;
    enum rarch_shader_type type = RARCH_SHADER_NONE;
+   global_t *global            = global_get_ptr();
 
    if (!global || !global->dir.shader_dir.list)
       return;
@@ -371,7 +372,6 @@ static void rarch_main_data_clear_state(void)
 bool runloop_ctl(enum runloop_ctl_state state, void *data)
 {
    settings_t *settings  = config_get_ptr();
-   global_t     *global  = global_get_ptr();
 
    switch (state)
    {
@@ -388,7 +388,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
             unsigned **scale = (unsigned**)data;
             if (!scale)
                return false;
-            *scale       = (unsigned*)&global->pending.windowed_scale;
+            *scale       = (unsigned*)&runloop_pending_windowed_scale;
          }
          break;
       case RUNLOOP_CTL_SET_WINDOWED_SCALE:
@@ -396,7 +396,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
             unsigned *idx = (unsigned*)data;
             if (!idx)
                return false;
-            global->pending.windowed_scale = *idx;
+            runloop_pending_windowed_scale = *idx;
          }
          break;
       case RUNLOOP_CTL_SET_LIBRETRO_PATH:
@@ -501,7 +501,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
             if (cmd->movie_record)
                runloop_ctl(RUNLOOP_CTL_CHECK_MOVIE, NULL);
 
-            check_shader_dir(global, cmd->shader_next_pressed,
+            check_shader_dir(cmd->shader_next_pressed,
                   cmd->shader_prev_pressed);
 
             if (cmd->disk_eject_pressed)
diff --git a/runloop.h b/runloop.h
index 3ef98d0d3e..c9573ecf64 100644
--- a/runloop.h
+++ b/runloop.h
@@ -184,11 +184,6 @@ typedef struct global
       bool ips_pref;
    } patch;
 
-   struct
-   {
-      unsigned windowed_scale;
-   } pending;
-
 #ifdef HAVE_MENU
    struct
    {