--- uae/src/gtkui.c	2018/04/24 16:46:13	1.1.1.5
+++ uae/src/gtkui.c	2018/04/24 16:47:26	1.1.1.6
@@ -44,6 +44,8 @@
 
 static int gui_active;
 
+static GtkWidget *pause_uae_widget;
+
 static GtkWidget *disk_insert_widget[4], *disk_eject_widget[4], *disk_text_widget[4];
 static char *new_disk_string[4];
 
@@ -237,7 +239,7 @@ static void joy_changed (void)
 
 static void custom_changed (void)
 {
-    changed_prefs.framerate = framerate_adj->value;
+    changed_prefs.gfx_framerate = framerate_adj->value;
     changed_prefs.blits_32bit_enabled = GTK_TOGGLE_BUTTON (b32_widget)->active;
     changed_prefs.immediate_blits = GTK_TOGGLE_BUTTON (bimm_widget)->active;
 }
@@ -315,6 +317,19 @@ static void did_eject (GtkWidget *w, gpo
     write_comm_pipe_int (&from_gui_pipe, (int)data, 1);
 }
 
+static void pause_uae (GtkWidget *widget, gpointer data)
+{
+    if (quit_gui)
+	return;
+
+    write_comm_pipe_int (&from_gui_pipe, GTK_TOGGLE_BUTTON (widget)->active ? 5 : 6, 1);  
+}
+
+static void end_pause_uae (void)
+{
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pause_uae_widget), FALSE);
+}
+    
 static int filesel_active = -1;
 static GtkWidget *selector;
 
@@ -643,7 +658,7 @@ static void make_gfx_widgets (GtkWidget
 
     add_empty_vbox (vbox);
 
-    framerate_adj = GTK_ADJUSTMENT (gtk_adjustment_new (currprefs.framerate, 1.0, 21.0, 1.0, 1.0, 1.0));
+    framerate_adj = GTK_ADJUSTMENT (gtk_adjustment_new (currprefs.gfx_framerate, 1.0, 21.0, 1.0, 1.0, 1.0));
     gtk_signal_connect (GTK_OBJECT (framerate_adj), "value_changed",
 			GTK_SIGNAL_FUNC (custom_changed), NULL);
 
@@ -733,13 +748,16 @@ static void make_joy_widgets (GtkWidget
     add_empty_vbox (dvbox);
 }
 
-static void make_button (const char *label, GtkWidget *box, void (*sigfunc) (void))
+static GtkWidget *make_buttons (const char *label, GtkWidget *box, void (*sigfunc) (void), GtkWidget *(*create)(const char *label))
 {
-    GtkWidget *thing = gtk_button_new_with_label (label);
+    GtkWidget *thing = create (label);
     gtk_widget_show (thing);
     gtk_signal_connect (GTK_OBJECT (thing), "clicked", (GtkSignalFunc) sigfunc, NULL);
     gtk_box_pack_start (GTK_BOX (box), thing, TRUE, TRUE, 0);
+
+    return thing;
 }
+#define make_button(label, box, sigfunc) make_buttons(label, box, sigfunc, gtk_button_new_with_label)
 
 static void *gtk_penguin (void *dummy)
 {
@@ -784,6 +802,7 @@ static void *gtk_penguin (void *dummy)
     make_button ("Debug", buttonbox, did_debug);
     make_button ("Quit", buttonbox, did_quit);
     make_button ("Save config", buttonbox, save_config);
+    pause_uae_widget = make_buttons ("Pause", buttonbox, pause_uae, gtk_toggle_button_new_with_label);
 
     /* The LED */
     thing = make_led (0);
@@ -903,34 +922,46 @@ void gui_filename(int num, const char *n
 
 void gui_handle_events(void)
 {
+    int pause_uae = FALSE;
+    
     if (no_gui)
 	return;
 
-    while (comm_pipe_has_data (&from_gui_pipe)) {
-	int cmd = read_comm_pipe_int_blocking (&from_gui_pipe);
-	int n;
-	switch (cmd) {
-	 case 0:
-	    n = read_comm_pipe_int_blocking (&from_gui_pipe);
-	    changed_prefs.df[n][0] = '\0';
-	    break;
-	 case 1:
-	    n = read_comm_pipe_int_blocking (&from_gui_pipe);
-	    uae_sem_wait (&gui_sem);
-	    strncpy (changed_prefs.df[n], new_disk_string[n], 255);
-	    changed_prefs.df[n][255] = '\0';
-	    uae_sem_post (&gui_sem);
-	    break;
-	 case 2:
-	    uae_reset ();
-	    break;
-	 case 3:
-	    activate_debugger ();
-	    break;
-	 case 4:
-	    uae_quit ();
-	    break;
-	}
-    }
-    
+    do {
+        while (pause_uae || comm_pipe_has_data (&from_gui_pipe)) {
+            int cmd = read_comm_pipe_int_blocking (&from_gui_pipe);
+            int n;
+            switch (cmd) {
+             case 0:
+                n = read_comm_pipe_int_blocking (&from_gui_pipe);
+                changed_prefs.df[n][0] = '\0';
+                break;
+             case 1:
+                n = read_comm_pipe_int_blocking (&from_gui_pipe);
+                uae_sem_wait (&gui_sem);
+                strncpy (changed_prefs.df[n], new_disk_string[n], 255);
+                changed_prefs.df[n][255] = '\0';
+                uae_sem_post (&gui_sem);
+                break;
+             case 2:
+                uae_reset ();
+                end_pause_uae ();
+                break;
+             case 3:
+                activate_debugger ();
+                end_pause_uae ();
+                break;
+             case 4:
+                uae_quit ();
+                end_pause_uae ();
+                break;
+             case 5:
+                pause_uae = TRUE;
+                break;
+             case 6:
+                pause_uae = FALSE;
+                break;
+            }
+        }
+    } while (pause_uae);
 }