Merge with new_config

2017-05-16 20:59:24 +01:00 · 2017-05-16 20:59:24 +01:00 · 183350c82f
commit 183350c82f
parent 9791f4283d 950ea99c01
37 changed files with 1193 additions and 590 deletions
--- a/src/win-d3d.cc
+++ b/src/win-d3d.cc
@ -173,7 +173,9 @@ void d3d_resize(int x, int y)
 void d3d_reset()
 {
        HRESULT hr;
-        
+
+        if (!d3ddev)
+                return;
        memset(&d3dpp, 0, sizeof(d3dpp));      

        d3dpp.Flags                  = 0;