SOURCES: uae-allow_spaces_in_zip_filenames.patch (NEW), uae-close_...
arekm
arekm at pld-linux.org
Sun May 20 17:58:31 CEST 2007
Author: arekm Date: Sun May 20 15:58:31 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- patches from gentoo
---- Files affected:
SOURCES:
uae-allow_spaces_in_zip_filenames.patch (NONE -> 1.1) (NEW), uae-close_window_hack.patch (NONE -> 1.1) (NEW), uae-fix_save_config.patch (NONE -> 1.1) (NEW), uae-fix_static_declatarions.patch (NONE -> 1.1) (NEW), uae-gtk-ui-cleanup.patch (NONE -> 1.1) (NEW), uae-makefile_more_cleaning.patch (NONE -> 1.1) (NEW), uae-memory_leaks_in_gui.patch (NONE -> 1.1) (NEW), uae-preserve_home_in_writing_optionsfile.patch (NONE -> 1.1) (NEW), uae-struct_uae_wrong_fields_name.patch (NONE -> 1.1) (NEW), uae-uae_reset_args.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/uae-allow_spaces_in_zip_filenames.patch
diff -u /dev/null SOURCES/uae-allow_spaces_in_zip_filenames.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-allow_spaces_in_zip_filenames.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,18 @@
+## 03_allow_spaces_in_zip_filenames.dpatch by Florian Ernst <florian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow spaces in filenames for zipped files, bug#238678
+
+ at DPATCH@
+diff -urNad uae-0.8.25~/src/zfile.c uae-0.8.25/src/zfile.c
+--- uae-0.8.25~/src/zfile.c 2005-07-01 17:53:26.000000000 +0200
++++ uae-0.8.25/src/zfile.c 2005-11-08 01:17:59.000000000 +0100
+@@ -126,7 +126,7 @@
+ if (!dst)
+ return 1;
+ #if defined AMIGA || defined __unix
+- sprintf (cmd, "unzip -p %s '*.adf' >%s", src, dst);
++ sprintf (cmd, "unzip -p \"%s\" '*.adf' >%s", src, dst);
+ return !system (cmd);
+ #endif
+ }
================================================================
Index: SOURCES/uae-close_window_hack.patch
diff -u /dev/null SOURCES/uae-close_window_hack.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-close_window_hack.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,33 @@
+The program did't quit after closing the GUI window with the close button, so
+we force the backend to exit, just to make the user happy.
+
+Antonio Ospite <ospite at studenti.unina.it>
+
+diff -bpruN uae-0.8.25/src/gtkui.c uae-0.8.25_patched/src/gtkui.c
+--- uae-0.8.25/src/gtkui.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25_patched/src/gtkui.c 2006-06-08 22:38:34.000000000 +0200
+@@ -557,7 +557,8 @@ static int my_idle (void)
+ }
+ }
+
+- if (gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)) == 0) {
++ int ret = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
++ if (ret == 0) {
+ for (i = 0; i < 5; i++) {
+ unsigned int mask = 1 << i;
+ unsigned int on = leds & mask;
+@@ -570,6 +571,14 @@ static int my_idle (void)
+ }
+ prevledstate = leds;
+ }
++
++ /* XXX Ugly hack here:
++ * exit if the gui gives error,
++ * this happens when we close the window.
++ */
++ if (ret < 0)
++ exit(0);
++
+ out:
+ return 1;
+ }
================================================================
Index: SOURCES/uae-fix_save_config.patch
diff -u /dev/null SOURCES/uae-fix_save_config.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-fix_save_config.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,16 @@
+The program did't save the changed version of the preferences structure.
+
+Antonio Ospite <ospite at studenti.unina.it>
+
+diff -bpruN uae-0.8.25/src/gtkui.c uae-0.8.25_patched/src/gtkui.c
+--- uae-0.8.25/src/gtkui.c 2006-06-08 23:57:36.000000000 +0200
++++ uae-0.8.25_patched/src/gtkui.c 2006-06-09 09:31:08.000000000 +0200
+@@ -282,7 +282,7 @@ static void save_config (void)
+ write_log ("Error saving options file!\n");
+ return;
+ }
+- save_options (f, &currprefs);
++ save_options (f, &changed_prefs);
+ fclose (f);
+ }
+
================================================================
Index: SOURCES/uae-fix_static_declatarions.patch
diff -u /dev/null SOURCES/uae-fix_static_declatarions.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-fix_static_declatarions.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,89 @@
+Fix some compilations errors due to external use of static variables.
+
+Antonio Ospite <ospite at studenti.unina.it>
+
+diff -pruN uae-0.8.25.orig/src/autoconf.c uae-0.8.25/src/autoconf.c
+--- uae-0.8.25.orig/src/autoconf.c 2006-06-07 15:31:17.000000000 +0200
++++ uae-0.8.25/src/autoconf.c 2006-06-07 15:38:03.000000000 +0200
+@@ -218,7 +218,7 @@ uaecptr EXPANSION_cddevice;
+
+ /* ROM tag area memory access */
+
+-static uae_u8 *rtarea;
++uae_u8 *rtarea;
+
+ static uae_u32 rtarea_lget (uaecptr) REGPARAM;
+ static uae_u32 rtarea_wget (uaecptr) REGPARAM;
+diff -pruN uae-0.8.25.orig/src/cia.c uae-0.8.25/src/cia.c
+--- uae-0.8.25.orig/src/cia.c 2006-06-07 15:31:17.000000000 +0200
++++ uae-0.8.25/src/cia.c 2006-06-07 15:38:03.000000000 +0200
+@@ -46,18 +46,18 @@ static unsigned int clock_control_d = RT
+ static unsigned int clock_control_e = 0;
+ static unsigned int clock_control_f = RTC_F_24_12;
+
+-static unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
+-static unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;
++unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
++unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;
+
+ /* Values of the CIA timers. */
+-static unsigned long ciaata, ciaatb, ciabta, ciabtb;
++unsigned long ciaata, ciaatb, ciabta, ciabtb;
+ /* Computed by compute_passed_time. */
+ static unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed;
+
+-static unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
+-static int ciaatlatch, ciabtlatch;
++unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
++int ciaatlatch, ciabtlatch;
+
+-static unsigned int ciabpra;
++unsigned int ciabpra;
+
+ unsigned int gui_ledstate;
+
+diff -pruN uae-0.8.25.orig/src/custom.c uae-0.8.25/src/custom.c
+--- uae-0.8.25.orig/src/custom.c 2006-06-07 15:31:17.000000000 +0200
++++ uae-0.8.25/src/custom.c 2006-06-07 15:38:03.000000000 +0200
+@@ -111,7 +111,8 @@ static unsigned int sprctl[MAX_SPRITES],
+ static uae_u16 sprdata[MAX_SPRITES][4], sprdatb[MAX_SPRITES][4];
+ static int sprite_last_drawn_at[MAX_SPRITES];
+ static int last_sprite_point, nr_armed;
+-static int sprite_width, sprres, sprite_buffer_res;
++static int sprres, sprite_buffer_res;
++int sprite_width;
+
+ static uae_u32 bpl1dat, bpl2dat, bpl3dat, bpl4dat, bpl5dat, bpl6dat, bpl7dat, bpl8dat;
+ static uae_s16 bpl1mod, bpl2mod;
+@@ -234,7 +235,7 @@ struct decision line_decisions[2 * (MAXV
+ struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1];
+ struct color_entry color_tables[2][(MAXVPOS + 1) * 2];
+
+-static int next_sprite_entry = 0;
++int next_sprite_entry = 0;
+ static int prev_next_sprite_entry;
+ static int next_sprite_forced = 1;
+
+diff -pruN uae-0.8.25.orig/src/inputdevice.c uae-0.8.25/src/inputdevice.c
+--- uae-0.8.25.orig/src/inputdevice.c 2006-06-07 15:31:17.000000000 +0200
++++ uae-0.8.25/src/inputdevice.c 2006-06-07 15:40:17.000000000 +0200
+@@ -511,8 +511,8 @@ void read_inputdevice_config (struct uae
+
+ /* Mousehack stuff */
+
+-static int ievent_alive = 0;
+-static int lastmx, lastmy;
++int ievent_alive = 0;
++int lastmx, lastmy;
+
+ int mousehack_alive (void)
+ {
+@@ -1739,7 +1739,7 @@ int inputdevice_translatekeycode (int ke
+ return 0;
+ }
+
+-static struct inputdevice_functions idev[3];
++struct inputdevice_functions idev[3];
+
+ void inputdevice_init (void)
+ {
================================================================
Index: SOURCES/uae-gtk-ui-cleanup.patch
diff -u /dev/null SOURCES/uae-gtk-ui-cleanup.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-gtk-ui-cleanup.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,47 @@
+--- uae-0.8.25/src/gtkui.c.orig 2007-02-16 18:40:02.000000000 +0300
++++ uae-0.8.25/src/gtkui.c 2007-02-16 18:40:06.000000000 +0300
+@@ -762,8 +762,8 @@
+ return;
+
+ write_comm_pipe_int (&from_gui_pipe, 0, 0);
+- write_comm_pipe_int (&from_gui_pipe, (int)data, 1);
+- gtk_label_set_text (GTK_LABEL (disk_text_widget[(int)data]), "");
++ write_comm_pipe_int (&from_gui_pipe, GPOINTER_TO_INT(data), 1);
++ gtk_label_set_text (GTK_LABEL (disk_text_widget[GPOINTER_TO_INT(data)]), "");
+ }
+
+ static void pause_uae (void)
+@@ -851,7 +851,7 @@
+
+ static void did_insert (GtkWidget *w, gpointer data)
+ {
+- int n = (int)data;
++ int n = GPOINTER_TO_INT(data);
+ if (filesel_active != -1)
+ return;
+ filesel_active = n;
+@@ -1131,7 +1131,7 @@
+ gdk_color_alloc (colormap, led_off + nr);
+ led_widgets[nr] = thing;
+ gtk_signal_connect (GTK_OBJECT (thing), "event",
+- (GtkSignalFunc) driveled_event, (gpointer) thing);
++ (GtkSignalFunc) driveled_event, GINT_TO_POINTER(thing));
+ gtk_widget_show (thing);
+
+ thing = gtk_preview_new (GTK_PREVIEW_COLOR);
+@@ -1198,13 +1198,13 @@
+ gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
+ gtk_widget_show (thing);
+ disk_eject_widget[i] = thing;
+- gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_eject, (gpointer) i);
++ gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_eject, GINT_TO_POINTER(i));
+
+ thing = gtk_button_new_with_label ("Insert");
+ gtk_box_pack_start (GTK_BOX (buttonbox), thing, FALSE, TRUE, 0);
+ gtk_widget_show (thing);
+ disk_insert_widget[i] = thing;
+- gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_insert, (gpointer) i);
++ gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) did_insert, GINT_TO_POINTER(i));
+ }
+
+ add_empty_vbox (vbox);
================================================================
Index: SOURCES/uae-makefile_more_cleaning.patch
diff -u /dev/null SOURCES/uae-makefile_more_cleaning.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-makefile_more_cleaning.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,16 @@
+Do some more cleaning, so we can build packages from the pristine upstream
+source even after the very first build.
+
+Antonio Ospite <ospite at studenti.unina.it>
+
+diff -pruN uae-0.8.25.orig/Makefile.in uae-0.8.25/Makefile.in
+--- uae-0.8.25.orig/Makefile.in 2006-06-07 15:31:17.000000000 +0200
++++ uae-0.8.25/Makefile.in 2006-06-07 16:12:12.000000000 +0200
+@@ -15,3 +15,7 @@ streifenfrei:
+ cd src && $(MAKE) streifenfrei
+ rm -f uae readdisk
+ rm -f config.cache config.log config.status Makefile
++ rm -f confdefs.h
++ rm -f src/tools/Makefile src/tools/config.* \
++ src/tools/cpudefs.c src/tools/sysconfig.h
++ rm -f src/md-fpp.h
================================================================
Index: SOURCES/uae-memory_leaks_in_gui.patch
diff -u /dev/null SOURCES/uae-memory_leaks_in_gui.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-memory_leaks_in_gui.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,29 @@
+## 02_memory_leaks_in_gui.dpatch by Florian Ernst <florian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix memory leaks in GUI code as mentioned in bug#201563
+
+ at DPATCH@
+diff -urNad uae-0.8.25~/src/gtkui.c uae-0.8.25/src/gtkui.c
+--- uae-0.8.25~/src/gtkui.c 2005-07-02 18:24:02.000000000 +0200
++++ uae-0.8.25/src/gtkui.c 2005-11-08 01:12:34.000000000 +0100
+@@ -798,7 +798,7 @@
+ uae_sem_post (&gui_sem);
+ write_comm_pipe_int (&from_gui_pipe, 1, 0);
+ write_comm_pipe_int (&from_gui_pipe, filesel_active, 1);
+- gtk_label_set_text (GTK_LABEL (disk_text_widget[filesel_active]), strdup (s));
++ gtk_label_set_text (GTK_LABEL (disk_text_widget[filesel_active]), s);
+ filesel_active = -1;
+ enable_disk_buttons (1);
+ gtk_widget_destroy (disk_selector);
+diff -urNad uae-0.8.25~/src/xwin.c uae-0.8.25/src/xwin.c
+--- uae-0.8.25~/src/xwin.c 2005-07-02 18:24:06.000000000 +0200
++++ uae-0.8.25/src/xwin.c 2005-11-08 01:13:01.000000000 +0100
+@@ -758,6 +758,7 @@
+ hints->window_group = mywin;
+ hints->flags = WindowGroupHint;
+ XSetWMHints(display, mywin, hints);
++ XFree(hints);
+
+ XMapRaised (display, mywin);
+ XSync (display, 0);
================================================================
Index: SOURCES/uae-preserve_home_in_writing_optionsfile.patch
diff -u /dev/null SOURCES/uae-preserve_home_in_writing_optionsfile.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-preserve_home_in_writing_optionsfile.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,28 @@
+Keep saving optionsfile to home dir, even if there is not one when reading
+config for the first time.
+
+Antonio Ospite <ospite at studenti.unina.it>
+
+diff -bpruN uae-0.8.25/src/main.c uae-0.8.25_patched/src/main.c
+--- uae-0.8.25/src/main.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25_patched/src/main.c 2006-06-08 20:33:05.000000000 +0200
+@@ -357,6 +357,7 @@ void parse_cmdline (int argc, char **arg
+ static void parse_cmdline_and_init_file (int argc, char **argv)
+ {
+ char *home;
++ char *pwd_optionsfile;
+
+ strcpy (optionsfile, "");
+
+@@ -374,8 +375,9 @@ static void parse_cmdline_and_init_file
+ if (! cfgfile_load (&currprefs, optionsfile)) {
+ #ifdef OPTIONS_IN_HOME
+ /* sam: if not found in $HOME then look in current directory */
+- strcpy (optionsfile, OPTIONSFILENAME);
+- cfgfile_load (&currprefs, optionsfile);
++ /* ao: but let's use a temporary name, so we save to home dir, yet :) */
++ strcpy (pwd_optionsfile, OPTIONSFILENAME);
++ cfgfile_load (&currprefs, pwd_optionsfile);
+ #endif
+ }
+
================================================================
Index: SOURCES/uae-struct_uae_wrong_fields_name.patch
diff -u /dev/null SOURCES/uae-struct_uae_wrong_fields_name.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-struct_uae_wrong_fields_name.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,18 @@
+Somewhere wrong (old) names are used in accessing the preferences structure.
+
+This is just a remainder for the upstream!!
+
+Antonio Ospite <ospite at studenti.unina.it>
+
+diff -pruN uae-0.8.25/src/tui.c uae-0.8.25_patched/src/tui.c
+--- uae-0.8.25/src/tui.c 2006-06-07 17:45:55.000000000 +0200
++++ uae-0.8.25_patched/src/tui.c 2006-06-07 17:55:39.000000000 +0200
+@@ -606,7 +606,7 @@ static void SoundOptions (void)
+ currprefs.sound_freq = atoi (tmp);
+ break;
+ case 5:
+- currprefs.stereo = (currprefs.stereo + 1) % 3;
++ currprefs.sound_stereo = (currprefs.sound_stereo + 1) % 3;
+ break;
+ }
+ }
================================================================
Index: SOURCES/uae-uae_reset_args.patch
diff -u /dev/null SOURCES/uae-uae_reset_args.patch:1.1
--- /dev/null Sun May 20 17:58:31 2007
+++ SOURCES/uae-uae_reset_args.patch Sun May 20 17:58:26 2007
@@ -0,0 +1,102 @@
+uae_reset() now wants some argument!
+
+Antonio Ospite <ospite at studenti.unina.it>
+
+diff -pruN uae-0.8.25___orig/src/ncurses.c uae-0.8.25/src/ncurses.c
+--- uae-0.8.25___orig/src/ncurses.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/ncurses.c 2006-06-07 17:42:33.000000000 +0200
+@@ -596,7 +596,7 @@ void handle_events(void)
+ if (ch == 16) --lastmy; /* ^P */
+ if (ch == 11) {buttonstate[0] = keydelay;ch = 0;} /* ^K */
+ if (ch == 25) {buttonstate[2] = keydelay;ch = 0;} /* ^Y */
+- if (ch == 15) uae_reset (); /* ^O */
++ if (ch == 15) uae_reset (0); /* ^O */
+ if (ch == 17) uae_quit (); /* ^Q */
+ if (ch == KEY_F(1)) {
+ curses_insert_disk();
+diff -pruN uae-0.8.25___orig/src/NeXTwin.m uae-0.8.25/src/NeXTwin.m
+--- uae-0.8.25___orig/src/NeXTwin.m 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/NeXTwin.m 2006-06-07 17:42:15.000000000 +0200
+@@ -86,7 +86,7 @@ static int keycode2amiga(NXEvent * theEv
+ @implementation AmigaView
+ -reset:sender
+ {
+- uae_reset();
++ uae_reset(0);
+ //m68k_reset();
+ return self;
+ }
+diff -pruN uae-0.8.25___orig/src/od-beos/beos.cpp uae-0.8.25/src/od-beos/beos.cpp
+--- uae-0.8.25___orig/src/od-beos/beos.cpp 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/od-beos/beos.cpp 2006-06-07 17:43:48.000000000 +0200
+@@ -719,7 +719,7 @@ void handle_events(void)
+ uint32 mouse_buttons;
+
+ if (reset_thyself) {
+- uae_reset();
++ uae_reset(0);
+ reset_thyself = false;
+ }
+
+diff -pruN uae-0.8.25___orig/src/od-win32/keyboard.c uae-0.8.25/src/od-win32/keyboard.c
+--- uae-0.8.25___orig/src/od-win32/keyboard.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/od-win32/keyboard.c 2006-06-07 17:44:04.000000000 +0200
+@@ -489,8 +489,8 @@ int my_kbd_handler (int keycode, int sca
+ record_key ((akey << 1) + 1);
+
+ /* "Affengriff" */
+- if( (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset();
+- //if( (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset();
++ if( (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_LAMI] && keystate[AK_RAMI])uae_reset(0);
++ //if( (keystate[AK_CTRL] || keystate[AK_RCTRL] ) && keystate[AK_RAMI])uae_reset(0);
+
+ return 0;
+ }
+diff -pruN uae-0.8.25___orig/src/od-win32/win32gui.c uae-0.8.25/src/od-win32/win32gui.c
+--- uae-0.8.25___orig/src/od-win32/win32gui.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/od-win32/win32gui.c 2006-06-07 17:44:16.000000000 +0200
+@@ -2261,7 +2261,7 @@ static BOOL CALLBACK MiscDlgProc (HWND h
+ }
+ break;
+ case IDC_RESETAMIGA:
+- uae_reset();
++ uae_reset(0);
+ break;
+ case IDC_QUITEMU:
+ uae_quit();
+diff -pruN uae-0.8.25___orig/src/sdlgfx.c uae-0.8.25/src/sdlgfx.c
+--- uae-0.8.25___orig/src/sdlgfx.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/sdlgfx.c 2006-06-07 17:42:57.000000000 +0200
+@@ -875,7 +875,7 @@ void handle_events (void)
+
+ /* Handle UAE reset */
+ if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
+- uae_reset ();
++ uae_reset (0);
+ }
+
+ int check_prefs_changed_gfx (void)
+diff -pruN uae-0.8.25___orig/src/svga.c uae-0.8.25/src/svga.c
+--- uae-0.8.25___orig/src/svga.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/svga.c 2006-06-07 17:43:17.000000000 +0200
+@@ -439,7 +439,7 @@ static void my_kbd_handler (int scancode
+
+ /* "Affengriff" */
+ if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
+- uae_reset ();
++ uae_reset (0);
+ }
+
+ static void leave_graphics_mode (void)
+diff -pruN uae-0.8.25___orig/src/tui.c uae-0.8.25/src/tui.c
+--- uae-0.8.25___orig/src/tui.c 2006-06-07 17:41:49.000000000 +0200
++++ uae-0.8.25/src/tui.c 2006-06-07 17:43:32.000000000 +0200
+@@ -684,7 +684,7 @@ static int do_gui (int mode)
+ case 0: DiskOptions (); break;
+ case 1: OtherOptions (); break;
+ case 2: save_settings (); break;
+- case 3: uae_reset (); break;
++ case 3: uae_reset (0); break;
+ case 4: uae_quit (); break;
+ }
+ }
================================================================
More information about the pld-cvs-commit
mailing list