# HG changeset patch # User Ryan C. Gordon # Date 1039813792 0 # Node ID 37c31c12eb703c17db2273cc5f639f89cbc1706e # Parent b528214c8c9a57fbc0ed818707b49b0a2154c1e0 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes cursor hiding, etc when calling SDL_SetVideoMode() multiple times. Fixed by Darrell Walisser. diff -r b528214c8c9a -r 37c31c12eb70 src/video/quartz/SDL_QuartzVideo.m --- a/src/video/quartz/SDL_QuartzVideo.m Wed Dec 11 05:52:28 2002 +0000 +++ b/src/video/quartz/SDL_QuartzVideo.m Fri Dec 13 21:09:52 2002 +0000 @@ -397,13 +397,6 @@ QZ_TearDownOpenGL (this); } - /* Restore gamma settings */ - CGDisplayRestoreColorSyncSettings (); - - /* Ensure the cursor will be visible and working when we quit */ - CGDisplayShowCursor (display_id); - CGAssociateMouseAndMouseCursorPosition (1); - /* Signal successful teardown */ video_set = SDL_FALSE; } @@ -576,7 +569,7 @@ return NULL; } - [ qz_window setReleasedWhenClosed:YES ]; + //[ qz_window setReleasedWhenClosed:YES ]; QZ_SetCaption(this, this->wm_title, this->wm_icon); [ qz_window setAcceptsMouseMovedEvents:YES ]; [ qz_window setViewsNeedDisplay:NO ]; @@ -1061,6 +1054,13 @@ static void QZ_VideoQuit (_THIS) { + /* Restore gamma settings */ + CGDisplayRestoreColorSyncSettings (); + + /* Ensure the cursor will be visible and working when we quit */ + CGDisplayShowCursor (display_id); + CGAssociateMouseAndMouseCursorPosition (1); + QZ_UnsetVideoMode (this); CGPaletteRelease (palette); }