wined3d: Don't clear the GL context if it's not the one being destroyed by…

wined3d: Don't clear the GL context if it's not the one being destroyed by context_destroy_gl_resources(). The previous code clears the GL context if the context being destroyed is not valid, even though the current one is some arbitrary, unrelated context.

wined3d: Don't clear the GL context if it's not the one being destroyed by…
59226e36 · Ken Thomases · Alexandre Julliard · 75d53c9a · 59226e36
Commit 59226e36 authored Feb 05, 2014 by Ken Thomases Committed by Alexandre Julliard Feb 06, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

context.c dlls/wined3d/context.c +3 -3

No files found.
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -888,10 +888,10 @@ static void context_destroy_gl_resources(struct wined3d_context *context)
    restore_dc = wglGetCurrentDC();
    restore_pf = GetPixelFormat(restore_dc);

-    if (context->valid && restore_ctx != context->glCtx)
-        context_set_gl_context(context);
-    else
+    if (restore_ctx == context->glCtx)
        restore_ctx = NULL;
+    else if (context->valid)
+        context_set_gl_context(context);

    LIST_FOR_EACH_ENTRY(occlusion_query, &context->occlusion_queries, struct wined3d_occlusion_query, entry)
    {