ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The dTools_running == NULL patch by Magliocchetti Riccardo (riccardom).

This commit is contained in:
yabause 2008-11-04 21:48:46 +00:00
parent 1909333fb0
commit 11cd506dfa
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
desmume/src/gtk/main.cpp
View File

@ -1374,7 +1374,8 @@ static void Start_dTool(GtkWidget *widget, gpointer data)
{ {
int tool = GPOINTER_TO_INT(data); int tool = GPOINTER_TO_INT(data);
if(dTools_running[tool]) return; if(dTools_running == NULL || dTools_running[tool])
return;
dTools_list[tool]->open(tool); dTools_list[tool]->open(tool);
dTools_running[tool] = TRUE; dTools_running[tool] = TRUE;
@ -1382,6 +1383,9 @@ static void Start_dTool(GtkWidget *widget, gpointer data)
void dTool_CloseCallback(int tool) void dTool_CloseCallback(int tool)
{ {
if (dTools_running == NULL)
return;
dTools_running[tool] = FALSE; dTools_running[tool] = FALSE;
} }
@ -1389,8 +1393,10 @@ void dTool_CloseCallback(int tool)
static inline void _updateDTools() static inline void _updateDTools()
{ {
int i; if (dTools_running == NULL)
for(i = 0; i < dTools_list_size; i++) { return;
for(int i = 0; i < dTools_list_size; i++) {
if(dTools_running[i]) { dTools_list[i]->update(); } if(dTools_running[i]) { dTools_list[i]->update(); }
} }
} }
@ -1587,7 +1593,8 @@ common_gtk_main( struct configured_features *my_config)
if(!init_joy()) return 1; if(!init_joy()) return 1;
dTools_running = (BOOL*)malloc(sizeof(BOOL) * dTools_list_size); dTools_running = (BOOL*)malloc(sizeof(BOOL) * dTools_list_size);
for(i=0; i<dTools_list_size; i++) dTools_running[i]=FALSE; if (dTools_running != NULL)
memset(dTools_running, FALSE, sizeof(BOOL) * dTools_list_size);
config_file = g_build_filename(g_get_home_dir(), ".desmume.ini", NULL); config_file = g_build_filename(g_get_home_dir(), ".desmume.ini", NULL);
Read_ConfigFile(config_file); Read_ConfigFile(config_file);
@ -1652,7 +1659,6 @@ common_gtk_main( struct configured_features *my_config)
GtkWidget *mLayers_Radio[10]; GtkWidget *mLayers_Radio[10];
gchar *buf; gchar *buf;
mEmulation = gtk_menu_new(); mEmulation = gtk_menu_new();
pMenuItem = gtk_menu_item_new_with_label("Emulation"); pMenuItem = gtk_menu_item_new_with_label("Emulation");
gtk_menu_item_set_submenu(GTK_MENU_ITEM(pMenuItem), mEmulation); gtk_menu_item_set_submenu(GTK_MENU_ITEM(pMenuItem), mEmulation);
@ -1730,7 +1736,6 @@ common_gtk_main( struct configured_features *my_config)
gtk_menu_shell_append(GTK_MENU_SHELL(mConfig), pMenuItem); gtk_menu_shell_append(GTK_MENU_SHELL(mConfig), pMenuItem);
#if 0 #if 0
GtkWidget *mFirmware; GtkWidget *mFirmware;
mFirmware = gtk_menu_new(); mFirmware = gtk_menu_new();