m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue 316: Crash in Brush factory when no scripts are present

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1371 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-03-02 00:59:01 +00:00
parent a7f51a0e60
commit 8486c61556
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
factory.c
View File

@ -49,6 +49,7 @@
#include <lauxlib.h> #include <lauxlib.h>
#include <lualib.h> #include <lualib.h>
#include <float.h> // for DBL_MAX #include <float.h> // for DBL_MAX
#include <unistd.h> // chdir()
/// ///
/// Number of characters for name in fileselector. /// Number of characters for name in fileselector.
@ -896,17 +897,18 @@ void Button_Brush_Factory(void)
Sort_list_of_files(&Scripts_list); Sort_list_of_files(&Scripts_list);
Window_set_normal_button(85, 141, 67, 14, "Cancel", 0, 1, KEY_ESC); // 1 Window_set_normal_button(85, 141, 67, 14, "Cancel", 0, 1, KEY_ESC); // 1
Window_set_normal_button(10, 141, 67, 14, "Run", 0, 1, SDLK_RETURN); // 2
Window_display_frame_in(6, FILESEL_Y - 2, NAME_WIDTH*8+4, 84); // File selector Window_display_frame_in(6, FILESEL_Y - 2, NAME_WIDTH*8+4, 84); // File selector
scriptlist = Window_set_list_button( scriptlist = Window_set_list_button(
// Fileselector // Fileselector
Window_set_special_button(8, FILESEL_Y + 1, NAME_WIDTH*8, 80), // 3 Window_set_special_button(8, FILESEL_Y + 1, NAME_WIDTH*8, 80), // 2
// Scroller for the fileselector // Scroller for the fileselector
(scriptscroll = Window_set_scroller_button(NAME_WIDTH*8+14, FILESEL_Y - 1, 82, (scriptscroll = Window_set_scroller_button(NAME_WIDTH*8+14, FILESEL_Y - 1, 82,
Scripts_list.Nb_elements,10, 0)), // 4 Scripts_list.Nb_elements,10, 0)), // 3
Draw_script_name); // 5 Draw_script_name); // 4
Window_set_normal_button(10, 141, 67, 14, "Run", 0, Scripts_list.Nb_elements!=0, SDLK_RETURN); // 5
Window_display_frame_in(6, FILESEL_Y + 88, (NAME_WIDTH+2)*8+4, 3*8+2); // Descr. Window_display_frame_in(6, FILESEL_Y + 88, (NAME_WIDTH+2)*8+4, 3*8+2); // Descr.
// Update position // Update position
@ -931,7 +933,7 @@ void Button_Brush_Factory(void)
switch (clicked_button) switch (clicked_button)
{ {
case 5: case 4:
Hide_cursor(); Hide_cursor();
Draw_script_information(Get_item_by_index(&Scripts_list, Draw_script_information(Get_item_by_index(&Scripts_list,
scriptlist->List_start + scriptlist->Cursor_position)); scriptlist->List_start + scriptlist->Cursor_position));
@ -943,12 +945,15 @@ void Button_Brush_Factory(void)
break; break;
} }
} while (clicked_button <= 0 || clicked_button >= 3); } while (clicked_button != 1 && clicked_button != 5);
strcpy(selected_script, Get_item_by_index(&Scripts_list, if (Scripts_list.Nb_elements == 0)
scriptlist->List_start + scriptlist->Cursor_position)-> Full_name); selected_script[0]='\0';
else
strcpy(selected_script, Get_item_by_index(&Scripts_list,
scriptlist->List_start + scriptlist->Cursor_position)-> Full_name);
if (clicked_button == 2) // Run the script if (clicked_button == 5) // Run the script
{ {
lua_State* L; lua_State* L;
const char* message; const char* message;