We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] proposed patch

file_1792.txt (text/plain), 1.23 KB, created by Marcel Bakker on 2013-04-07 10:22:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel Bakker

Created: 2013-04-07 10:22:49 UTC

Size: 1.23 KB

patch

obsolete

>diff -r 64a2c8c882e1 src/video/SDL_video.c
>--- a/src/video/SDL_video.c	Fri Apr 05 16:34:59 2013 -0400
>+++ b/src/video/SDL_video.c	Sun Apr 07 16:18:05 2013 +0200
>@@ -2682,16 +2682,13 @@
>     if (!(window->flags & SDL_WINDOW_OPENGL)) {
>         return SDL_SetError("The specified window isn't an OpenGL window");
>     }
>-    if (!ctx) {
>-        window = NULL;
>-    }
>-
>-    if ((window == _this->current_glwin) && (ctx == _this->current_glctx)) {
>+
>+    if ( ctx && (window == _this->current_glwin) && (ctx == _this->current_glctx) ) {
>         retval = 0;  /* we're already current. */
>     } else {
>         retval = _this->GL_MakeCurrent(_this, window, ctx);
>         if (retval == 0) {
>-            _this->current_glwin = window;
>+            _this->current_glwin = ( ctx ? window : NULL );
>             _this->current_glctx = ctx;
>         }
>     }
>@@ -2745,7 +2742,11 @@
>     if (!_this || !context) {
>         return;
>     }
>-    _this->GL_MakeCurrent(_this, NULL, NULL);
>+    if ( context == _this->current_glctx ) {
>+        _this->GL_MakeCurrent(_this, _this->current_glwin, NULL);
>+        _this->current_glwin = NULL;
>+        _this->current_glctx = NULL;
>+    }
>     _this->GL_DeleteContext(_this, context);
> }
>

Actions: View | Diff

Attachments on bug 1792: 1104 | 1105

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.