Fixed missing cursor after shadow buffer flip (thanks Jan!)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40489

src/video/SDL_video.c

@@ -994,8 +994,9 @@ void SDL_UpdateRects (SDL_Surface *screen, int numrects, SDL_Rect *rects)
 						SDL_VideoSurface, &rects[i]);
 			}
 		}
-		if ( saved_colors )
+		if ( saved_colors ) {
 			pal->colors = saved_colors;
+		}
 
 		/* Fall through to video surface update */
 		screen = SDL_VideoSurface;
@@ -1045,10 +1046,22 @@ int SDL_Flip(SDL_Surface *screen)
 		rect.y = 0;
 		rect.w = screen->w;
 		rect.h = screen->h;
-		SDL_LowerBlit(SDL_ShadowSurface,&rect, SDL_VideoSurface,&rect);
-
-		if ( saved_colors )
+		if ( SHOULD_DRAWCURSOR(SDL_cursorstate) ) {
+			SDL_LockCursor();
+			SDL_DrawCursor(SDL_ShadowSurface);
+			SDL_LowerBlit(SDL_ShadowSurface, &rect,
+					SDL_VideoSurface, &rect);
+			SDL_EraseCursor(SDL_ShadowSurface);
+			SDL_UnlockCursor();
+		} else {
+			SDL_LowerBlit(SDL_ShadowSurface, &rect,
+					SDL_VideoSurface, &rect);
+		}
+		if ( saved_colors ) {
 			pal->colors = saved_colors;
+		}
+
+		/* Fall through to video surface update */
 		screen = SDL_VideoSurface;
 	}
 	if ( (screen->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF ) {