Mercurial > sdl-ios-xcode

diff src/video/SDL_video.c @ 4755:436183eb30c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main repo (mainly for non-printable character fix)
author dewyatt
date Sun, 18 Jul 2010 13:48:23 -0400
parents 11b0a6a3eb4d c04dd942610d
children 518d1679d2d0
line wrap: on
line diff
--- a/src/video/SDL_video.c	Tue Jul 13 15:05:45 2010 -0400
+++ b/src/video/SDL_video.c	Sun Jul 18 13:48:23 2010 -0400
@@ -2833,6 +2833,10 @@
         SDL_free(_this->displays);
         _this->displays = NULL;
     }
+    if (_this->clipboard_text) {
+        SDL_free(_this->clipboard_text);
+        _this->clipboard_text = NULL;
+    }
     _this->free(_this);
     _this = NULL;
 }
@@ -3267,7 +3271,7 @@
 void
 SDL_GL_DeleteContext(SDL_GLContext context)
 {
-    if (!_this || !context) {
+    if (!_this || !_this->gl_data || !context) {
         return;
     }
     _this->GL_MakeCurrent(_this, NULL, NULL);