From: Jeffrey D. <ha...@us...> - 2003-09-14 00:10:42
|
Log Message: ----------- GKusnick's changes - kill assert on debug code with 'blank' icon Modified Files: -------------- /cvsroot/decaldev/source/Inject: IconCache.cpp Revision Data ------------- Index: IconCache.cpp =================================================================== RCS file: /cvsroot/decaldev/source/Inject/IconCache.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- IconCache.cpp 19 May 2002 02:36:21 -0000 1.4 +++ IconCache.cpp 14 Sep 2003 00:10:10 -0000 1.5 @@ -241,6 +241,9 @@ cIconBuffer *pBuffer; int nIndex; +// GKusnick: Handle no-icon case without asserting. + if (nModule == 0 && nFile == 0) return S_OK; + if( !findIcon( reinterpret_cast< HMODULE >( nModule ), *reinterpret_cast< DWORD* >( &nFile ), pBuffer, nIndex ) ) { if( nModule == 0 ) |