1 files changed, 25 insertions, 17 deletions

diff --git a/uisimulator/sdl/lcd-remote-bitmap.c b/uisimulator/sdl/lcd-remote-bitmap.c
index ecb9904a40..c44e476288 100644
--- a/uisimulator/sdl/lcd-remote-bitmap.c
+++ b/uisimulator/sdl/lcd-remote-bitmap.c
@@ -24,7 +24,7 @@
 #include "lcd-remote-bitmap.h"
 #include "screendump.h"
 
-SDL_Surface *remote_surface;
+SDL_Surface *remote_surface = 0;
 
 SDL_Color remote_bl_color_dark    = {RED_CMP(LCD_REMOTE_BL_DARKCOLOR),
                                      GREEN_CMP(LCD_REMOTE_BL_DARKCOLOR),
@@ -65,27 +65,35 @@ void lcd_remote_update (void)
 
 void lcd_remote_update_rect(int x_start, int y_start, int width, int height)
 {
-    sdl_update_rect(remote_surface, x_start, y_start, width, height,
-        LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT, get_lcd_remote_pixel);
-    sdl_gui_update(remote_surface, x_start, y_start, width, height,
-        LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT, background ? UI_REMOTE_POSX : 0,
-        background ? UI_REMOTE_POSY : LCD_HEIGHT);
+    if (remote_surface)
+    {
+        sdl_update_rect(remote_surface, x_start, y_start, width, height,
+            LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT, get_lcd_remote_pixel);
+        sdl_gui_update(remote_surface, x_start, y_start, width, height,
+            LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT, background ? UI_REMOTE_POSX : 0,
+            background ? UI_REMOTE_POSY : LCD_HEIGHT);
+    }
 }
 
 void sim_remote_backlight(int value)
 {
-    if (value > 0) {
-        sdl_set_gradient(remote_surface, &remote_bl_color_dark,
-                         &remote_bl_color_bright, 0, NUM_SHADES);
-    } else {
-        sdl_set_gradient(remote_surface, &remote_color_dark,
-                         &remote_color_bright, 0, NUM_SHADES);
+    if (remote_surface)
+    {
+        if (value > 0) 
+        {
+            sdl_set_gradient(remote_surface, &remote_bl_color_dark,
+                             &remote_bl_color_bright, 0, NUM_SHADES);
+        } 
+        else
+        {
+            sdl_set_gradient(remote_surface, &remote_color_dark,
+                             &remote_color_bright, 0, NUM_SHADES);
+        }
+        sdl_gui_update(remote_surface, 0, 0, LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT,
+                       LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT,
+                       background ? UI_REMOTE_POSX : 0,
+                       background? UI_REMOTE_POSY : LCD_HEIGHT);
     }
-
-    sdl_gui_update(remote_surface, 0, 0, LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT,
-                   LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT,
-                   background ? UI_REMOTE_POSX : 0,
-                   background? UI_REMOTE_POSY : LCD_HEIGHT);
 }
 
 /* initialise simulator lcd remote driver */