From 1f3409dba80b9bdf4ef2738a322c234032487477 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 16 Jan 2017 23:27:55 +0100
Subject: [PATCH] (ui_win32.c) Some minor cleanups

---
 ui/drivers/ui_win32.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 0fe7a67ae1..b20cea7c5c 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -115,12 +115,15 @@ typedef struct
 
 static shader_dlg_t g_shader_dlg = {{0}};
 
-static void shader_dlg_refresh_trackbar_label(int index)
+static bool shader_dlg_refresh_trackbar_label(int index)
 {
    video_shader_ctx_t shader_info;
    char val_buffer[32]         = {0};
 
    video_shader_driver_get_current_shader(&shader_info);
+   
+   if (!shader_info.data)
+      return false;
 
    if (floorf(shader_info.data->parameters[index].current) 
          == shader_info.data->parameters[index].current)
@@ -133,6 +136,7 @@ static void shader_dlg_refresh_trackbar_label(int index)
    SendMessage(g_shader_dlg.controls[index].trackbar.label_val,
          WM_SETTEXT, 0, (LPARAM)val_buffer);
 
+   return true;
 }
 
 static void shader_dlg_params_refresh(void)
@@ -153,14 +157,15 @@ static void shader_dlg_params_refresh(void)
       {
          case SHADER_PARAM_CTRL_CHECKBOX:
             {
-               bool checked = 
+               bool checked = shader_info.data ?
                   (shader_info.data->parameters[i].current == 
-                   shader_info.data->parameters[i].maximum);
+                   shader_info.data->parameters[i].maximum) : false;
                SendMessage(control->checkbox.hwnd, BM_SETCHECK, checked, 0);
             }
             break;
          case SHADER_PARAM_CTRL_TRACKBAR:
-            shader_dlg_refresh_trackbar_label(i);
+            if (!shader_dlg_refresh_trackbar_label(i))
+               break;
 
             SendMessage(control->trackbar.hwnd,
                   TBM_SETRANGEMIN, (WPARAM)TRUE, (LPARAM)0);
@@ -219,10 +224,11 @@ void shader_dlg_params_reload(void)
    int i, pos_x, pos_y;
    video_shader_ctx_t shader_info;
    const ui_window_t *window = ui_companion_driver_get_window_ptr();
-   video_shader_driver_get_current_shader(&shader_info);
 
    shader_dlg_params_clear();
 
+   video_shader_driver_get_current_shader(&shader_info);
+
    if (!shader_info.data)
       return;
    if (shader_info.data->num_parameters > GFX_MAX_PARAMETERS)