Browse Source

Merge pull request #1076 from Type1J/JLS-CEF-D3D-BLIT-CRASH-FIX

Fixes #1074
JoshEngebretson 9 years ago
parent
commit
f5946ff78c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Source/AtomicWebView/WebTexture2D.cpp

+ 1 - 1
Source/AtomicWebView/WebTexture2D.cpp

@@ -224,7 +224,7 @@ public:
         D3DLOCKED_RECT d3dLockedRect;
         D3DLOCKED_RECT d3dLockedRect;
         IDirect3DTexture9* object = (IDirect3DTexture9*) webTexture2D_->GetTexture2D()->GetGPUObject();
         IDirect3DTexture9* object = (IDirect3DTexture9*) webTexture2D_->GetTexture2D()->GetGPUObject();
 
 
-        if (FAILED(object->LockRect(level, &d3dLockedRect, (flags & D3DLOCK_DISCARD) ? 0 : &d3dRect, flags)))
+        if (!object || FAILED(object->LockRect(level, &d3dLockedRect, (flags & D3DLOCK_DISCARD) ? 0 : &d3dRect, flags)))
         {
         {
             ATOMIC_LOGERROR("WebTexture2D - Could not lock texture");
             ATOMIC_LOGERROR("WebTexture2D - Could not lock texture");
             return;
             return;