Commit e2cbed54 authored by Ryan C. Gordon's avatar Ryan C. Gordon

Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes

 cursor hiding, etc when calling SDL_SetVideoMode() multiple times. Fixed by
 Darrell Walisser.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40561
parent a31f0acb
......@@ -397,13 +397,6 @@ static void QZ_UnsetVideoMode (_THIS) {
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 @@ static SDL_Surface* QZ_SetVideoWindowed (_THIS, SDL_Surface *current, int width,
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_UpdateRects (_THIS, int numRects, SDL_Rect *rects) {
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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment