From 06ff1c710e3984f9aabbdeae3e066de1befce3d9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Sat, 26 Jan 2013 13:39:47 +0100
Subject: [PATCH] ddraw: Unset the viewport if the current vp is deleted.

---
 dlls/ddraw/device.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index ace6a128d82..eca9d69f759 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -833,6 +833,13 @@ static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirec
         return DDERR_INVALIDPARAMS;
     }
 
+    if (device->current_viewport == vp)
+    {
+        TRACE("Deleting current viewport, unsetting and releasing\n");
+        IDirect3DViewport3_Release(viewport);
+        device->current_viewport = NULL;
+    }
+
     vp->active_device = NULL;
     list_remove(&vp->entry);
 
-- 
2.11.4.GIT