Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes
authorRyan C. Gordon <icculus@icculus.org>
Fri, 13 Dec 2002 21:09:52 +0000
changeset 560 37c31c12eb70
parent 559 b528214c8c9a
child 561 4bcf7dd06c47
Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes cursor hiding, etc when calling SDL_SetVideoMode() multiple times. Fixed by Darrell Walisser.
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);
 }