ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx: Minor bugfix for DoMerge encountering a NULL pointer in rare cases. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1369 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-06-15 20:15:17 +00:00
parent 136716a4f5
commit 674ac75d6a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/GSdx/GSDevice.cpp
View File

@ -164,7 +164,11 @@ void GSDevice::Merge(GSTexture* st[2], GSVector4* sr, GSVector4* dr, const GSVec
// TODO: m_1x1
DoMerge(st, sr, dr, m_merge, slbg, mmod, c);
// KH:COM crashes at startup when booting *through the bios* due to m_merge being NULL.
// (texture appears to be non-null, and is being re-created at a size around like 1700x340,
// dunno if that's relevant) -- air
if( m_merge )
DoMerge(st, sr, dr, m_merge, slbg, mmod, c);
m_current = m_merge;
}