Fixed a couple of crashes

multitheftauto · Aug 28, 2016 · 68ad3b4 · 68ad3b4
1 parent 154589e
commit 68ad3b4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/Client/core/CCommandFuncs.cpp b/Client/core/CCommandFuncs.cpp
@@ -450,8 +450,11 @@ void CCommandFuncs::Test ( const char* szParameters )
         CVARS_GET ( "nick", strNick );
         if ( strNick == szParameters )
         {
-            int* pData = NULL;
-            *pData = 0;
+            if ( FileExists ( CalcMTASAPath ( "debug.txt" ) ) )
+            {
+                int* pData = NULL;
+                *pData = 0;
+            }
         }
     }
 }

diff --git a/Client/core/DXHook/CProxyDirect3D9.cpp b/Client/core/DXHook/CProxyDirect3D9.cpp
@@ -717,6 +717,15 @@ bool CreateDeviceSecondCallCheck( HRESULT& hOutResult, IDirect3D9* pDirect3D, UI
         return true;
     }
 
+    // Also check for calls from other threads
+    if ( !IsMainThread () )
+    {
+        SString strMessage ( " Passing through call #%d to CreateDevice because not main thread", uiCreateCount );
+        WriteDebugEvent ( strMessage );
+        AddReportLog ( 8627, strMessage );
+        return true;
+    }
+
     if ( ++uiCreateCount == 1 )
         return false;
     WriteDebugEvent ( SString ( " Passing through call #%d to CreateDevice", uiCreateCount ) );

diff --git a/Client/core/Graphics/CRenderItem.EffectWrap.cpp b/Client/core/Graphics/CRenderItem.EffectWrap.cpp
@@ -1215,8 +1215,8 @@ SString CEffectWrapImpl::GetAnnotationNameAndValue( D3DXHANDLE hParameter, uint
     D3DXPARAMETER_DESC AnnotDesc;
     m_pD3DEffect->GetParameterDesc( hAnnotation, &AnnotDesc );
     LPCSTR szAnnotValue;
-    m_pD3DEffect->GetString( hAnnotation, &szAnnotValue );
-    strOutValue = szAnnotValue;
+    if ( SUCCEEDED( m_pD3DEffect->GetString( hAnnotation, &szAnnotValue ) ) )
+        strOutValue = szAnnotValue;
     return AnnotDesc.Name;
 }