Fixed D3D9-only crash.

diff --git a/od-win32/direct3d.cpp b/od-win32/direct3d.cpp
index 13925f5ad79c1496ede64bd9a4956c14185e0ac7..36776131179ff063135145c8be1662cf0e390bae 100644 (file)
--- a/od-win32/direct3d.cpp
+++ b/od-win32/direct3d.cpp
@@ -3816,11 +3816,24 @@ static uae_u8 *xD3D_locktexture (int monid, int *pitch, int *width, int *height,
                return d3d->fakebitmap;
        }
 
+       if (!isd3d(d3d)) {
+               return NULL;
+       }
+
+       if (D3D_needreset(d3d) > 0) {
+               return NULL;
+       }
+
+       if (d3d->locked) {
+               write_log (_T("%s: texture already locked!\n"), D3DHEAD);
+               return NULL;
+       }
+
        if (fullupdate < 0) {
-               if (d3d->usetexture == d3d->texture1) {
+               if (d3d->texture1 && d3d->texture2 && d3d->usetexture == d3d->texture1) {
                        LPDIRECT3DTEXTURE9 tex1 = d3d->texture1;
                        LPDIRECT3DTEXTURE9 tex2 = d3d->texture2;
-                       IDirect3DSurface9* s1, * s2;
+                       IDirect3DSurface9 *s1, *s2;
                        if (SUCCEEDED(tex1->GetSurfaceLevel(0, &s1))) {
                                if (SUCCEEDED(tex2->GetSurfaceLevel(0, &s2))) {
                                        HRESULT hr = d3d->d3ddev->StretchRect(s1, NULL, s2, NULL, D3DTEXF_NONE);
@@ -3834,17 +3847,6 @@ static uae_u8 *xD3D_locktexture (int monid, int *pitch, int *width, int *height,
                d3d->usetexture = d3d->texture1;
        }
 
-       if (D3D_needreset (d3d) > 0) {
-               return NULL;
-       }
-       if (!isd3d (d3d))
-               return NULL;
-
-       if (d3d->locked) {
-               write_log (_T("%s: texture already locked!\n"), D3DHEAD);
-               return NULL;
-       }
-
        if (!d3d->texture1) {
                *pitch = 0;
                d3d->fakelock++;