--- uae/src/svga.c	2018/04/24 16:44:51	1.1.1.6
+++ uae/src/svga.c	2018/04/24 17:02:02	1.1.1.10
@@ -18,15 +18,15 @@
 
 #include "config.h"
 #include "options.h"
-#include "threaddep/penguin.h"
+#include "threaddep/thread.h"
 #include "uae.h"
 #include "memory.h"
-#include "custom.h"
-#include "readcpu.h"
-#include "newcpu.h"
 #include "keyboard.h"
 #include "xwin.h"
+#include "custom.h"
+#include "drawing.h"
 #include "keybuf.h"
+#include "newcpu.h"
 #include "tui.h"
 #include "gui.h"
 #include "picasso96.h"
@@ -473,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;
@@ -508,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;
@@ -697,7 +699,7 @@ int graphics_init (void)
 #endif
 	gfxvidinfo.emergmem = 0;
     }
-
+    printf ("rowbytes %d\n", gfxvidinfo.rowbytes);
     init_colors ();
     buttonstate[0] = buttonstate[1] = buttonstate[2] = 0;
     for(i = 0; i < 256; i++)