Fix a crash in 'Copy to spare:Palette' when both images have different height. Fix Lua which didin't report useful message when an error was detected.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1337 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-02-13 14:54:19 +00:00
parent 05d6d546a3
commit 87432470f3
2 changed files with 4 additions and 3 deletions

View File

@ -809,8 +809,9 @@ void Button_Brush_Factory(void)
} }
else if (lua_pcall(L, 0, 0, 0) != 0) else if (lua_pcall(L, 0, 0, 0) != 0)
{ {
message = lua_tostring(L, 1); int stack_size;
if(message) stack_size= lua_gettop(L);
if (stack_size>0 && (message = lua_tostring(L, stack_size))!=NULL)
Verbose_error_message(message); Verbose_error_message(message);
else else
Warning_message("Unknown error running script!"); Warning_message("Unknown error running script!");

View File

@ -283,7 +283,7 @@ void Redraw_spare_image(void)
// Copy it in Spare_visible_image // Copy it in Spare_visible_image
memcpy(Spare_visible_image.Image, memcpy(Spare_visible_image.Image,
Spare_backups->Pages->Image[layer], Spare_backups->Pages->Image[layer],
Spare_image_width*Main_image_height); Spare_image_width*Spare_image_height);
// No depth buffer in the spare // No depth buffer in the spare
//memset(Spare_visible_image_depth_buffer.Image, //memset(Spare_visible_image_depth_buffer.Image,