From 919357ab46ddbfff49c677cd2379e5051962ab71 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Sat, 29 Sep 2012 16:01:53 +0000
Subject: [PATCH] Fix crash when loading 24-bit brushes

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2020 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 src/buttons.c  | 14 ++++++--------
 src/loadsave.c |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/buttons.c b/src/buttons.c
index ebd5cffe..61f62091 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -3276,16 +3276,14 @@ void Load_picture(byte image)
           Compute_limits();
           Compute_paintbrush_coordinates();
         }
-      }
 
-      Compute_optimal_menu_colors(Main_palette);
-      Redraw_layered_image();
-      End_of_modification();
-      Check_menu_mode();
-      Display_all_screen();
-
-      if (image)
+        Compute_optimal_menu_colors(Main_palette);
+        Redraw_layered_image();
+        End_of_modification();
+        Check_menu_mode();
+        Display_all_screen();
         Main_image_is_modified=0;
+      }
     }
 
     Destroy_context(&context);
diff --git a/src/loadsave.c b/src/loadsave.c
index 7d6601a9..8039cd4e 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -685,7 +685,7 @@ void Load_image(T_IO_Context *context)
           Cursor_shape=CURSOR_SHAPE_HOURGLASS;
           Display_cursor();
           Flush_update();
-          if (Convert_24b_bitmap_to_256(Brush,context->Buffer_image_24b,context->Width,context->Height,context->Palette))
+          if (Convert_24b_bitmap_to_256(context->Buffer_image,context->Buffer_image_24b,context->Width,context->Height,context->Palette))
             File_error=2;
           Hide_cursor();
           Cursor_shape=CURSOR_SHAPE_ARROW;