From ae828393ce38b4a15ed9f9b47d615eb5505d5f47 Mon Sep 17 00:00:00 2001
From: Simon <simon@hardwired.org.uk>
Date: Mon, 6 Dec 2010 19:45:01 +0000
Subject: [PATCH] Fix open_ui bug where client will crash with a null pointer
 exception if the prerender_save function returns null due to newer save or
 other

---
 includes/defines.h |  2 +-
 src/interface.c    | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/includes/defines.h b/includes/defines.h
index f5d238599..18c98691b 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -8,7 +8,7 @@
 #endif
 
 #define SAVE_VERSION 44
-#define MINOR_VERSION 1
+#define MINOR_VERSION 2
 #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter.
 #define BETA
 
diff --git a/src/interface.c b/src/interface.c
index 191ddf0ce..5b9a1331d 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -2720,9 +2720,14 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date)
             if(status == 200)
             {
                 pixel *full_save = prerender_save(data, data_size, &imgw, &imgh);
-                save_pic = rescale_img(full_save, imgw, imgh, &thumb_w, &thumb_h, 2);
-                data_ready = 1;
-                free(full_save);
+				if(full_save!=NULL){
+					save_pic = rescale_img(full_save, imgw, imgh, &thumb_w, &thumb_h, 2);
+					data_ready = 1;
+					free(full_save);
+				} else {
+					error_ui(vid_buf, 0, "Save may be from a newer version");
+					break;
+				}
             }
             active = 0;
             free(http);