--- uae/src/gtkui.c	2018/04/24 17:07:20	1.1.1.14
+++ uae/src/gtkui.c	2018/04/24 17:12:32	1.1.1.17
@@ -87,6 +87,7 @@ static GtkWidget *dirdlg;
 static char dirdlg_volname[256], dirdlg_path[256];
 
 static GtkWidget *lab_info;
+static GtkWidget *notebook;
 
 static smp_comm_pipe to_gui_pipe, from_gui_pipe;
 static uae_sem_t gui_sem, gui_init_sem, gui_quit_sem; /* gui_sem protects the DFx fields */
@@ -181,12 +182,11 @@ static void set_chipset_state (void)
     else if (currprefs.chipset_mask & CSMASK_ECS_AGNUS)
 	t0 = 1;
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cslevel_widget[t0]), TRUE);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fcop_widget), currprefs.fast_copper != 0);
 }
 
 static void set_sound_state (void)
 {
-    int stereo = currprefs.stereo + currprefs.mixed_stereo;
+    int stereo = currprefs.sound_stereo + currprefs.mixed_stereo;
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sound_widget[currprefs.produce_sound]), 1);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sound_ch_widget[stereo]), 1);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sound_bits_widget[currprefs.sound_bits == 16]), 1);
@@ -326,11 +326,11 @@ static int my_idle (void)
 	int cmd = read_comm_pipe_int_blocking (&to_gui_pipe);
 	int n;
 	switch (cmd) {
-	 case 0:
+	case 0:
 	    n = read_comm_pipe_int_blocking (&to_gui_pipe);
 	    gtk_label_set_text (GTK_LABEL (disk_text_widget[n]), currprefs.df[n]);
 	    break;
-	 case 1:
+	case 1:
 	    /* Initialization.  */
 	    set_cpu_widget ();
 	    set_cpu_state ();
@@ -345,29 +345,31 @@ static int my_idle (void)
 	    uae_sem_post (&gui_init_sem);
 	    gui_active = 1;
 	    break;
-	 case 2:
+	case 2:
 	    /* Set Pause-Button active */
 	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pause_uae_widget), TRUE);
 	    break;
-	 case 3:
+	case 3:
 	    /* Set Pause-Button inactive */
 	    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pause_uae_widget), FALSE);
 	    break;
 	}
     }
 
-    for (i = 0; i < 5; i++) {
-	unsigned int mask = 1 << i;
-	unsigned int on = leds & mask;
-
-	if (on == (prevledstate & mask))
-	    continue;
-
-/*	printf(": %d %d\n", i, on);*/
-	draw_led (i);
+    if (gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)) == 0) {
+	for (i = 0; i < 5; i++) {
+	    unsigned int mask = 1 << i;
+	    unsigned int on = leds & mask;
+
+	    if (on == (prevledstate & mask))
+		continue;
+
+	    /*	printf(": %d %d\n", i, on);*/
+	    draw_led (i);
+   	}
+	prevledstate = leds;
     }
-    prevledstate = leds;
-out:
+  out:
     return 1;
 }
 
@@ -413,7 +415,6 @@ static void custom_changed (void)
 {
     changed_prefs.gfx_framerate = framerate_adj->value;
     changed_prefs.immediate_blits = GTK_TOGGLE_BUTTON (bimm_widget)->active;
-    changed_prefs.fast_copper = GTK_TOGGLE_BUTTON (fcop_widget)->active;
 #if 0
     changed_prefs.blits_32bit_enabled = GTK_TOGGLE_BUTTON (b32_widget)->active;
     changed_prefs.gfx_afullscreen = GTK_TOGGLE_BUTTON (afscr_widget)->active;
@@ -493,10 +494,10 @@ static void p96size_changed (void)
 static void sound_changed (void)
 {
     changed_prefs.produce_sound = find_current_toggle (sound_widget, 4);
-    changed_prefs.stereo = find_current_toggle (sound_ch_widget, 3);
+    changed_prefs.sound_stereo = find_current_toggle (sound_ch_widget, 3);
     changed_prefs.mixed_stereo = 0;
-    if (changed_prefs.stereo == 2)
-	changed_prefs.mixed_stereo = changed_prefs.stereo = 1;
+    if (changed_prefs.sound_stereo == 2)
+	changed_prefs.mixed_stereo = changed_prefs.sound_stereo = 1;
     changed_prefs.sound_bits = (find_current_toggle (sound_bits_widget, 2) + 1) * 8;
 }
 
@@ -905,7 +906,7 @@ static GtkWidget *make_led (int nr)
     thing = gtk_preview_new (GTK_PREVIEW_COLOR);
     gtk_box_pack_start (GTK_BOX (the_led), thing, TRUE, TRUE, 0);
     gtk_widget_show (thing);
-    
+
     return the_led;
 }
 
@@ -1152,13 +1153,6 @@ static void make_chipset_widgets (GtkWid
     gtk_widget_show (newbox);
     gtk_box_pack_start (GTK_BOX (hbox), newbox, FALSE, TRUE, 0);
 
-    fcop_widget = gtk_check_button_new_with_label ("Enable copper speedup code");
-    add_centered_to_vbox (vbox, fcop_widget);
-    gtk_widget_show (fcop_widget);
-
-    gtk_signal_connect (GTK_OBJECT (fcop_widget), "clicked",
-			(GtkSignalFunc) custom_changed, NULL);
-
     add_empty_vbox (vbox);
 }
 
@@ -1487,7 +1481,9 @@ static void make_about_widgets (GtkWidge
 {
     GtkWidget *lab_version;
     GtkStyle *style;
+#if 0
     GdkFont *font;
+#endif
     char t[20];
 
     add_empty_vbox (dvbox);
@@ -1496,6 +1492,7 @@ static void make_about_widgets (GtkWidge
     lab_version = gtk_label_new (t);
     lab_info = gtk_label_new ("Choose your settings, then deselect the Pause button to start!");
 
+#if 0
     font = gdk_font_load ("-*-helvetica-medium-r-normal--*-240-*-*-*-*-*-*");
     if (font) {
 	style = gtk_style_new ();
@@ -1505,6 +1502,7 @@ static void make_about_widgets (GtkWidge
 	gtk_widget_set_style (lab_version, style);
 	/*gtk_widget_set_style (lab_info, style); */
     }
+#endif
 
     add_centered_to_vbox (dvbox, lab_version);
     add_centered_to_vbox (dvbox, lab_info);
@@ -1517,7 +1515,7 @@ static void make_about_widgets (GtkWidge
 
 static void create_guidlg (void)
 {
-    GtkWidget *window, *notebook;
+    GtkWidget *window;
     GtkWidget *buttonbox, *vbox, *hbox;
     GtkWidget *thing;
     unsigned int i;