commit fe4b0c9e97d685b3f88426ed073dfe626810bf45
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Sep 13 00:53:11 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Sep 13 00:53:11 2011 +0000
tree 0b476f88d87c9715d520c040f88a17af0626270f
parent a866244f4d6dd131c35128cb9aef9398c53c8b3e

Fix resetting of non-existing device

TRAC #18139
Signed-off-by: Daniel Koch
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@750 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libEGL/Display.cpp

diff --git a/src/libEGL/Display.cpp b/src/libEGL/Display.cpp
index 84abbce..e031981 100644
--- a/src/libEGL/Display.cpp
+++ b/src/libEGL/Display.cpp
@@ -775,10 +775,12 @@
     {
         return FAILED(mDeviceEx->CheckDeviceState(NULL));
     }
-    else
+    else if(mDevice)
     {
         return FAILED(mDevice->TestCooperativeLevel());
     }
+
+    return false;   // No device yet, so no reset required
 }
 
 void Display::getMultiSampleSupport(D3DFORMAT format, bool *multiSampleArray)