Module: wine Branch: master Commit: a05dcd911ebaf64138d330ecf5db3e3ce8700bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05dcd911ebaf64138d330ecf5...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Mar 11 18:41:47 2014 +0100
wined3d: Handle shader_arb_free_context_data() during context creation.
---
dlls/wined3d/arb_program_shader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d7e9ef7..1eab0eb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5052,8 +5052,12 @@ static BOOL shader_arb_allocate_context_data(struct wined3d_context *context)
static void shader_arb_free_context_data(struct wined3d_context *context) { - struct shader_arb_priv *priv = context->swapchain->device->shader_priv; + struct shader_arb_priv *priv; + + if (!context->swapchain) + return;
+ priv = context->swapchain->device->shader_priv; if (priv->last_context == context) priv->last_context = NULL; }