diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp
index 23a08484..a1fd01fe 100644
--- a/src/gui/sdl_mapper.cpp
+++ b/src/gui/sdl_mapper.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: sdl_mapper.cpp,v 1.7 2004-09-07 08:58:02 qbix79 Exp $ */
+/* $Id: sdl_mapper.cpp,v 1.8 2004-10-02 11:15:59 qbix79 Exp $ */
 
 #define OLD_JOYSTICK 1
 
@@ -1224,8 +1224,11 @@ void MAPPER_Run(void) {
 		mousetoggle=true;
 		GFX_CaptureMouse();
 	}
-   
+
+	/* Be sure that there is no update in progress */
+	if (sdl.updating) GFX_EndUpdate();
 	mapper.surface=SDL_SetVideoMode(640,480,8,0);
+
 	/* Set some palette entries */
 	SDL_SetPalette(mapper.surface, SDL_LOGPAL|SDL_PHYSPAL, map_pal, 0, 4);
 	/* Go in the event loop */