From 336483e7448c24b70cb71e278b888865a96bdf8c Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 22 Jun 2004 22:03:11 +0000 Subject: moved a check to *maybe* get rid of a kernel panic caused by drawRect CVS patchset: 6735 CVS date: 2004/06/22 22:03:11 --- src/video_out/macosx/video_window.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/video_out/macosx/video_window.m b/src/video_out/macosx/video_window.m index e161613b3..5ebdc3a84 100644 --- a/src/video_out/macosx/video_window.m +++ b/src/video_out/macosx/video_window.m @@ -29,7 +29,7 @@ #import "video_window.h" -NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification"; +static NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification"; #define DEFAULT_VIDEO_WINDOW_SIZE (NSMakeSize(320, 200)) @@ -513,6 +513,11 @@ NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification"; - (void) drawRect: (NSRect) rect { [currentContext makeCurrentContext]; + + if (!initDone) { + [currentContext flushBuffer]; + return; + } /* Swap buffers only during the vertical retrace of the monitor. http://developer.apple.com/documentation/GraphicsImaging/Conceptual/OpenGL/chap5/chapter_5_section_44.html */ @@ -523,11 +528,6 @@ NSString *XineViewDidResizeNotification = @"XineViewDidResizeNotification"; /* Black background */ glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - if (!initDone) { - [currentContext flushBuffer]; - return; - } - /* Draw */ glBindTexture (GL_TEXTURE_RECTANGLE_EXT, i_texture); [self drawQuad]; -- cgit v1.2.3