From 21500ca5917dbc02c21edcb5f2ab98ca3156a2a5 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Mon, 15 Oct 2018 03:31:57 +0200
Subject: [PATCH] make sure d3ddev is not null

---
 cnc-ddraw.vcxproj                     | 2 +-
 cnc-ddraw.vcxproj.filters             | 2 +-
 inc/{d3d9renderer.h => render_d3d9.h} | 0
 src/main.c                            | 2 +-
 src/render_d3d9.c                     | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename inc/{d3d9renderer.h => render_d3d9.h} (100%)

diff --git a/cnc-ddraw.vcxproj b/cnc-ddraw.vcxproj
index a3b4c71..e23e04f 100644
--- a/cnc-ddraw.vcxproj
+++ b/cnc-ddraw.vcxproj
@@ -26,7 +26,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="inc\clipper.h" />
-    <ClInclude Include="inc\d3d9renderer.h" />
+    <ClInclude Include="inc\render_d3d9.h" />
     <ClInclude Include="inc\ddraw.h" />
     <ClInclude Include="inc\debug.h" />
     <ClInclude Include="inc\glext.h" />
diff --git a/cnc-ddraw.vcxproj.filters b/cnc-ddraw.vcxproj.filters
index 822037c..be5c913 100644
--- a/cnc-ddraw.vcxproj.filters
+++ b/cnc-ddraw.vcxproj.filters
@@ -95,7 +95,7 @@
     <ClInclude Include="inc\d3d9shader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="inc\d3d9renderer.h">
+    <ClInclude Include="inc\render_d3d9.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/inc/d3d9renderer.h b/inc/render_d3d9.h
similarity index 100%
rename from inc/d3d9renderer.h
rename to inc/render_d3d9.h
diff --git a/src/main.c b/src/main.c
index 1d9e68b..943a1b4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,7 +24,7 @@
 #include "palette.h"
 #include "surface.h"
 #include "clipper.h"
-#include "d3d9renderer.h"
+#include "render_d3d9.h"
 
 #define IDR_MYMENU 93
 
diff --git a/src/render_d3d9.c b/src/render_d3d9.c
index 4c4ed0f..99f7b1f 100644
--- a/src/render_d3d9.c
+++ b/src/render_d3d9.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "surface.h"
 #include "d3d9shader.h"
-#include "d3d9renderer.h"
+#include "render_d3d9.h"
 
 
 HMODULE Direct3D9_hModule;
@@ -107,7 +107,7 @@ BOOL Direct3D9_Reset()
     D3dpp.BackBufferHeight = D3dpp.Windowed ? 0 : ddraw->render.height;
     D3dpp.BackBufferFormat = BitsPerPixel == 16 ? D3DFMT_R5G6B5 : D3DFMT_X8R8G8B8;
 
-    if (SUCCEEDED(D3dDev->lpVtbl->Reset(D3dDev, &D3dpp)))
+    if (D3dDev && SUCCEEDED(D3dDev->lpVtbl->Reset(D3dDev, &D3dpp)))
         return SetStates();
 
     return FALSE;