diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-08-22 15:05:59 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-08-22 15:05:59 +0000 |
| commit | c9b34c524d3fea849eef4066b8fa77497c1b2597 (patch) | |
| tree | d2c5abfda3c737145e2a9146679a577677f85c87 /gui | |
| parent | 54e6ea3610e17cf16fde1472f73864db3b3b3cf5 (diff) | |
| download | pcsxr-c9b34c524d3fea849eef4066b8fa77497c1b2597.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@27235 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/Gtk2Gui.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c index 723c0989..ad6254b8 100644 --- a/gui/Gtk2Gui.c +++ b/gui/Gtk2Gui.c @@ -479,11 +479,12 @@ void OnFile_RunExe() { GtkFileFilter *exefilter = gtk_file_filter_new (); gtk_file_filter_add_pattern (exefilter, "*.exe"); gtk_file_filter_add_pattern (exefilter, "*.psx"); + gtk_file_filter_add_pattern (exefilter, "*.cpe"); gtk_file_filter_set_name (exefilter, _("PlayStation Executable Files")); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), exefilter); GtkFileFilter *allfilter = gtk_file_filter_new (); gtk_file_filter_add_pattern (allfilter, "*"); - gtk_file_filter_set_name (allfilter, "All Files"); + gtk_file_filter_set_name (allfilter, _("All Files")); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), allfilter); /* Set this to the config object and retain it - maybe LastUsedDir */ @@ -503,19 +504,16 @@ void OnFile_RunExe() { LoadPlugins(); NetOpened = 0; - /* TODO If a CDR plugin image has not been selected, then OpenPlugins() will prompt us to - configure the plugin, even though we don't need it for EXE files. Need to pass a parameter - or something */ if (OpenPlugins() == -1) { - /* TODO Error message */ - SysRunGui(); g_free(file); + SysRunGui(); } else { SysReset(); + if (Load(file) == 0) { + g_free(file); if (Config.Dbg) hdb_start(); psxCpu->Execute(); - g_free(file); } else { g_free(file); ClosePlugins(); |