--- a/src/video/SDL_surface.c	Sun Jul 25 18:31:50 2004 +0000
+++ b/src/video/SDL_surface.c	Sun Jul 25 18:43:07 2004 +0000
@@ -901,6 +901,9 @@
 	if ( --surface->refcount > 0 ) {
 		return;
 	}
+	while ( surface->locked > 0 ) {
+		SDL_UnlockSurface(surface);
+	}
 	if ( (surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL ) {
 	        SDL_UnRLESurface(surface, 0);
 	}