Addendum to 066f475 (Added test fix for #9085 (Clone failed @ 'dxCreateShader'))

ccw808 · ccw808 · commit 6c2e674f58aa · 2015-12-29T04:13:47.000Z
diff --git a/MTA10/core/CRenderItem.EffectCloner.cpp b/MTA10/core/CRenderItem.EffectCloner.cpp
@@ -118,6 +118,7 @@ ID3DXEffect* CEffectClonerImpl::CreateD3DEffect ( const SString& strFilename, co
         if ( !pEffectTemplate )
         {
             AddReportLog( 7544, SString( "NewEffectTemplate failed (%s) %s", *strOutStatus, *strFilename ) );
+            return NULL;
         }
 
         OutputDebugLine ( SString ( "[Shader] CEffectClonerImpl::CreateD3DEffect - New EffectTemplate for %s", *strFilename ) );
@@ -240,7 +241,7 @@ void CEffectClonerImpl::MaybeTidyUp ( bool bForceDrasticMeasures )
         CEffectTemplate* pEffectTemplate = m_OldList[i];
         if ( pEffectTemplate->GetTicksSinceLastUsed () > ( bForceDrasticMeasures ? 0 : 1 ) )
         {
-            OutputDebugLine ( "[Shader] CEffectClonerImpl::MaybeTidyUp: Releasing old EffectTemplate" );                
+            OutputDebugLine ( "[Shader] CEffectClonerImpl::MaybeTidyUp: Releasing old EffectTemplate" );
             SAFE_RELEASE( pEffectTemplate );
             ListRemoveIndex ( m_OldList, i-- );
         }

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ ID3DXEffect* CEffectClonerImpl::CreateD3DEffect ( const SString& strFilename, co`
`118`	`118`	`if ( !pEffectTemplate )`
`119`	`119`	`{`
`120`	`120`	`AddReportLog( 7544, SString( "NewEffectTemplate failed (%s) %s", strOutStatus, strFilename ) );`
	`121`	`+ return NULL;`
`121`	`122`	`}`
`122`	`123`
`123`	`124`	`OutputDebugLine ( SString ( "[Shader] CEffectClonerImpl::CreateD3DEffect - New EffectTemplate for %s", *strFilename ) );`
`@@ -240,7 +241,7 @@ void CEffectClonerImpl::MaybeTidyUp ( bool bForceDrasticMeasures )`
`240`	`241`	`CEffectTemplate* pEffectTemplate = m_OldList[i];`
`241`	`242`	`if ( pEffectTemplate->GetTicksSinceLastUsed () > ( bForceDrasticMeasures ? 0 : 1 ) )`
`242`	`243`	`{`
`243`		`- OutputDebugLine ( "[Shader] CEffectClonerImpl::MaybeTidyUp: Releasing old EffectTemplate" );`
	`244`	`+ OutputDebugLine ( "[Shader] CEffectClonerImpl::MaybeTidyUp: Releasing old EffectTemplate" );`
`244`	`245`	`SAFE_RELEASE( pEffectTemplate );`
`245`	`246`	`ListRemoveIndex ( m_OldList, i-- );`
`246`	`247`	`}`