--- uae/src/svga.c	2018/04/24 16:46:14	1.1.1.7
+++ uae/src/svga.c	2018/04/24 16:56:42	1.1.1.9
@@ -26,7 +26,6 @@
 #include "custom.h"
 #include "drawing.h"
 #include "keybuf.h"
-#include "readcpu.h"
 #include "newcpu.h"
 #include "tui.h"
 #include "gui.h"
@@ -474,10 +473,11 @@ static int post_enter_graphics (void)
 static int enter_graphics_mode (int which)
 {
     int oldmode = current_vgamode;
+    vga_setmode (TEXT);
     if (vga_setmode (which) < 0) {
 	sleep(1);
 	vga_setmode (TEXT);
-	fprintf (stderr, "SVGAlib doesn't like my video mode. Giving up.\n");
+	fprintf (stderr, "SVGAlib doesn't like my video mode (%d). Giving up.\n", which);
 	return 0;
     }
     current_vgamode = which;
@@ -509,10 +509,11 @@ static int enter_graphics_mode_picasso (
     if (which == oldmode)
 	return 1;
 
+    vga_setmode (TEXT);
     if (vga_setmode (which) < 0) {
 	sleep (1);
 	vga_setmode (TEXT);
-	fprintf (stderr, "SVGAlib doesn't like my video mode. Giving up.\n");
+	fprintf (stderr, "SVGAlib doesn't like my video mode (%d). Giving up.\n", which);
 	exit (1);
     }
     current_vgamode = which;