From aeb57823953cb308f6f3b05dcdae04c1f2304c7e Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Thu, 6 Dec 2012 21:16:27 +1100
Subject: [PATCH] Merge conflict.  Fixes issue 5471.

---
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
index dfe63ee1ef..15214317d2 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
@@ -371,6 +371,8 @@ void CWII_IPC_HLE_Device_FileIO::DoState(PointerWrap &p)
 	p.Do(have_file_handle);
 	p.Do(m_Mode);
 	p.Do(seek);
+	p.Do(m_SeekPos);
+	p.Do(m_Filename);
 
 	if (p.GetMode() == PointerWrap::MODE_READ)
 	{