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

Fix crash on opening nonexistent file. Keep shaders from appearing in 

the recent files menu.
This commit is contained in:
Brandon Wright 2012-04-07 16:43:34 -05:00
parent 63ec714739
commit 4f551d3d29
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/src/gtk_s9x.cpp
View File

@ -207,8 +207,6 @@ S9xOpenROM (const char *rom_filename)
} }
else else
{ {
S9xReset ();
CPU.Flags = flags; CPU.Flags = flags;
Settings.Paused = 1; Settings.Paused = 1;

6
gtk/src/gtk_s9xwindow.cpp
View File

@ -976,6 +976,8 @@ Snes9xWindow::try_open_rom (const char *filename)
} }
else else
{ {
const char *groups[] = { "cartridge", NULL };
GtkRecentData recent_data = GtkRecentData recent_data =
{ {
NULL, NULL,
@ -983,7 +985,7 @@ Snes9xWindow::try_open_rom (const char *filename)
(gchar *) "application/x-snes-rom", (gchar *) "application/x-snes-rom",
(gchar *) "Snes9x", (gchar *) "Snes9x",
NULL, NULL,
NULL, (gchar **) groups,
FALSE FALSE
}; };
gchar *u_filename; gchar *u_filename;
@ -1833,7 +1835,7 @@ Snes9xWindow::show (void)
GtkRecentFilter *filter = gtk_recent_filter_new (); GtkRecentFilter *filter = gtk_recent_filter_new ();
GtkRecentChooser *chooser = GTK_RECENT_CHOOSER (recent_menu); GtkRecentChooser *chooser = GTK_RECENT_CHOOSER (recent_menu);
gtk_recent_filter_add_application (filter, "Snes9x"); gtk_recent_filter_add_group (filter, "cartridge");
gtk_recent_chooser_set_local_only (chooser, TRUE); gtk_recent_chooser_set_local_only (chooser, TRUE);
gtk_recent_chooser_set_show_icons (chooser, FALSE); gtk_recent_chooser_set_show_icons (chooser, FALSE);
gtk_recent_chooser_set_sort_type (chooser, GTK_RECENT_SORT_MRU); gtk_recent_chooser_set_sort_type (chooser, GTK_RECENT_SORT_MRU);