Merge conflict. Fixes issue 5471.
This commit is contained in:
1 parent
bbf7c3a4d0
commit
aeb5782395
1 file changed
+2
@@ -371,6 +371,8 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
|
|||||||
p.Do(have_file_handle);
|
p.Do(have_file_handle);
|
||||||
p.Do(m_Mode);
|
p.Do(m_Mode);
|
||||||
p.Do(seek);
|
p.Do(seek);
|
||||||
|
p.Do(m_SeekPos);
|
||||||
|
p.Do(m_Filename);
|
||||||
|
|
||||||
if (p.GetMode() == PointerWrap::MODE_READ)
|
if (p.GetMode() == PointerWrap::MODE_READ)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user