From ede03659ca8099a78361d9c1c9862c03edc37d57 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Thu, 21 May 2020 22:31:51 +0200
Subject: [PATCH] Update

---
 gfx/gfx_widgets.c |  5 +++--
 retroarch.c       | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c
index 32a5c437a5..f34a0ce3ed 100644
--- a/gfx/gfx_widgets.c
+++ b/gfx/gfx_widgets.c
@@ -1509,7 +1509,9 @@ void gfx_widgets_frame(void *data)
    bool widgets_is_rewinding;
    bool runloop_is_slowmotion;
    int top_right_x_advance;
-   int scissor_me_timbers;
+#ifdef HAVE_CHEEVOS
+   int scissor_me_timbers    = 0;
+#endif
 
    if (!widgets_active)
       return;
@@ -1528,7 +1530,6 @@ void gfx_widgets_frame(void *data)
    widgets_is_rewinding      = video_info->widgets_is_rewinding;
    runloop_is_slowmotion     = video_info->runloop_is_slowmotion;
    top_right_x_advance       = video_width;
-   scissor_me_timbers        = 0;
 
    gfx_widgets_frame_count++;
 
diff --git a/retroarch.c b/retroarch.c
index 1e0a30c1b2..1942c8a549 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -5771,26 +5771,27 @@ static bool run_translation_service(bool paused)
    json_buffer = (char*)malloc(json_length);
    if (!json_buffer)
       goto finish;
+    
    /* Image data */
-   memcpy(json_buffer, (const void*)rf1, 11*sizeof(uint8_t));
-   memcpy(json_buffer+11, bmp64_buffer, (out_length)*sizeof(uint8_t));
-   memcpy(json_buffer+11+out_length, "\"", 1*sizeof(uint8_t));
-   curr_length = 11+out_length+1;
+   memcpy(json_buffer, (const void*)rf1, 11 * sizeof(uint8_t));
+   memcpy(json_buffer + 11, bmp64_buffer, out_length * sizeof(uint8_t));
+   memcpy(json_buffer + 11 + out_length, "\"", 1 * sizeof(uint8_t));
+   curr_length = 11 + out_length + 1;
 
    /* State data */
    memcpy(json_buffer+curr_length, state_son, state_son_length*sizeof(uint8_t));
-   curr_length+= state_son_length;
+   curr_length += state_son_length;
 
    /* System Label */
    if (rf3)
    {
-      memcpy(json_buffer+curr_length, (const void*)rf3, (15+strlen(system_label))*sizeof(uint8_t));   
-      curr_length+=15+strlen(system_label);
+      memcpy(json_buffer + curr_length, (const void*)rf3, (15 + strlen(system_label)) * sizeof(uint8_t));
+      curr_length += 15 + strlen(system_label);
    }
    else
    {
-      memcpy(json_buffer+curr_length, (const void*)rf2, 3*sizeof(uint8_t));
-      curr_length+=3;
+      memcpy(json_buffer + curr_length, (const void*)rf2, 3 * sizeof(uint8_t));
+      curr_length += 3;
    }
 
 #ifdef DEBUG
@@ -21690,7 +21691,7 @@ static bool video_driver_init_internal(bool *video_is_threaded)
 
       if (config_file_directory)
       {
-         dir_list_is_free = !dir_init_shader(
+         dir_init_shader(
                config_file_directory,
                settings->bools.show_hidden_files);
          free(config_file_directory);