From 9687b218d1378c7435541f8c782ab3c0f4ff36b7 Mon Sep 17 00:00:00 2001
From: SarahW <SarahW@localhost>
Date: Wed, 7 Jun 2017 17:59:21 +0100
Subject: [PATCH] Direct3D code now fatals out instead of crashing if D3D
 device can not be created.

---
 src/win-d3d-fs.cc | 3 ++-
 src/win-d3d.cc    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/win-d3d-fs.cc b/src/win-d3d-fs.cc
index b0f2c0a..c611647 100644
--- a/src/win-d3d-fs.cc
+++ b/src/win-d3d-fs.cc
@@ -95,7 +95,8 @@ void d3d_fs_init(HWND h)
         d3dpp.BackBufferWidth        = d3d_fs_w;
         d3dpp.BackBufferHeight       = d3d_fs_h;
 
-        d3d->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, h, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &d3ddev);
+        if (FAILED(d3d->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, h, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &d3ddev)))
+                fatal("CreateDevice failed\n");
         
         d3d_fs_init_objects();
         
diff --git a/src/win-d3d.cc b/src/win-d3d.cc
index 763df0f..0abcc80 100644
--- a/src/win-d3d.cc
+++ b/src/win-d3d.cc
@@ -72,7 +72,8 @@ void d3d_init(HWND h)
         d3dpp.BackBufferWidth        = 0;
         d3dpp.BackBufferHeight       = 0;
 
-        d3d->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, h, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &d3ddev);
+        if (FAILED(d3d->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, h, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &d3ddev)))
+                fatal("CreateDevice failed\n");
         
         d3d_init_objects();