From 7476a026758a12ccebe612f0cd13a73f3e30da95 Mon Sep 17 00:00:00 2001 From: damdoum Date: Sun, 7 Jan 2007 12:37:41 +0000 Subject: [PATCH] began correcting this error : actions not enabled when loading rom from command line --- desmume/src/gtk-glade/callbacks.c | 14 +++++++++----- desmume/src/gtk-glade/globals.h | 3 +++ desmume/src/gtk-glade/main.c | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/desmume/src/gtk-glade/callbacks.c b/desmume/src/gtk-glade/callbacks.c index bd71518c4..ba648b078 100755 --- a/desmume/src/gtk-glade/callbacks.c +++ b/desmume/src/gtk-glade/callbacks.c @@ -7,6 +7,14 @@ gboolean ScreenGap=FALSE; /* inline & protos */ +void enable_rom_features() { + SET_SENSITIVE("menu_exec", TRUE); + SET_SENSITIVE("menu_pause", TRUE); + SET_SENSITIVE("menu_reset", TRUE); + SET_SENSITIVE("wgt_Exec", TRUE); + SET_SENSITIVE("wgt_Reset", TRUE); +} + void MAINWINDOW_RESIZE() { GtkWidget * spacer1 = glade_xml_get_widget(xml, "misc_sep3"); GtkWidget * spacer2 = glade_xml_get_widget(xml, "misc_sep4"); @@ -81,12 +89,8 @@ void file_open() { gtk_dialog_run(GTK_DIALOG(pDialog)); gtk_widget_destroy(pDialog); } else { - SET_SENSITIVE("menu_exec", TRUE); - SET_SENSITIVE("menu_pause", TRUE); - SET_SENSITIVE("menu_reset", TRUE); - SET_SENSITIVE("wgt_Exec", TRUE); - SET_SENSITIVE("wgt_Reset", TRUE); desmume_resume(); + enable_rom_features(); } g_free(sChemin); diff --git a/desmume/src/gtk-glade/globals.h b/desmume/src/gtk-glade/globals.h index ebdf71cd6..a9b8ec636 100755 --- a/desmume/src/gtk-glade/globals.h +++ b/desmume/src/gtk-glade/globals.h @@ -31,6 +31,9 @@ GtkWidget * pDrawingArea; GtkWidget * pDrawingArea2; GladeXML * xml, * xml_tools; +/* callbacks.c */ +void enable_rom_features(); + /* callbacks_IO.c */ int ScreenCoeff_Size; gboolean ScreenRotate; diff --git a/desmume/src/gtk-glade/main.c b/desmume/src/gtk-glade/main.c index 5b0c8a8c1..eebc67655 100755 --- a/desmume/src/gtk-glade/main.c +++ b/desmume/src/gtk-glade/main.c @@ -158,6 +158,7 @@ int main(int argc, char *argv[]) { if(commandLine_File) { if(desmume_open(commandLine_File) >= 0) { desmume_resume(); + enable_rom_features(); } else { GtkWidget *pDialog = gtk_message_dialog_new(GTK_WINDOW(pWindow), GTK_DIALOG_MODAL,