fixes for backing up wii saves when playing a movie

2 files changed, 2 insertions, 13 deletions

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
index ee0d1b0a22..4de2b0feb7 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
@@ -912,7 +912,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
 		{
 			if (File::Exists((savePath + "../backup/").c_str()))
 			{
-				// Dolphin must have crashed while playing back a movie previously, so we'll keep the backup, and just delete the current save
+				// The last run of this game must have been to play back a movie, so their save is already backed up. 
 				File::DeleteDirRecursively(savePath.c_str());
 			}
 			else
@@ -928,7 +928,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
 	}
 	else if (File::Exists((savePath + "../backup/").c_str()))
 	{
-		// Dolphin must have crashed while playing back a movie previously. Since we're not playing a movie now, we'll delete the save, and use the backup
+		// Delete the save made by a previous movie, and copy back the user's save.
 		if (File::Exists((savePath + "banner.bin").c_str()))
 			File::DeleteDirRecursively(savePath);
 		#ifdef _WIN32
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index d6e9780ba3..f98254e9a8 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -1022,17 +1022,6 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf,
 
 void EndPlayInput(bool cont) 
 {
-	if (IsPlayingInput() && IsConfigSaved() && IsStartingFromClearSave() && Core::g_CoreStartupParameter.bWii)
-	{
-		std::string savePath = Common::GetTitleDataPath(g_titleID);
-		File::DeleteDirRecursively(savePath.c_str());
-		#ifdef _WIN32
-			MoveFile((savePath + "../backup/").c_str(), savePath.c_str());
-		#else
-			File::CopyDir((savePath + "../backup/").c_str(), savePath.c_str());
-			File::DeleteDirRecursively((savePath + "../backup/").c_str());
-		#endif
-	}
 	if (cont)
 	{
 		g_playMode = MODE_RECORDING;