From 3e8c4b2b6daad9963d3614dae787d8dd12e62ae4 Mon Sep 17 00:00:00 2001
From: "fix94.1" <fix94.1@gmail.com>
Date: Thu, 20 Sep 2012 19:21:57 +0000
Subject: [PATCH] -fuck this emu nand shit and use the code before r713 again
 with that one million checks

---
 source/menu/menu_game.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index 97f26e4a..002d8863 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -1072,9 +1072,9 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 	if(!forwarder && has_enabled_providers() && _initNetwork() == 0)
 		add_game_to_card(id.c_str());
 
-	string emuPath = m_cfg.getString("NAND", "path", STDEMU_DIR);;
-	//m_partRequest = m_cfg.getInt("NAND", "partition", 0);
-	//int emuPartition = _FindEmuPart(&emuPath, m_partRequest, false);
+	string emuPath;
+	m_partRequest = m_cfg.getInt("NAND", "partition", 0);
+	int emuPartition = _FindEmuPart(&emuPath, m_partRequest, false);
 	int emulate_mode = min(max(0, m_cfg.getInt("NAND", "emulation", 1)), (int)ARRAY_SIZE(CMenu::_NandEmu) - 1);
 	
 	int userIOS = m_gcfg2.getInt(id, "ios", 0);
@@ -1087,8 +1087,8 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 	m_cfg.save(true);
 	cleanup();
 
-	if(useNK2o && currentPartition != 1)
-		useNK2o = false;
+	/*if(useNK2o && emuPartition != 1)
+		useNK2o = false;*/
 
 	if(useNK2o && !emu_disabled)
 	{
@@ -1109,8 +1109,8 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 	{
 		if(!emu_disabled)
 		{
-			DeviceHandler::Instance()->UnMount(currentPartition);
-			Nand::Instance()->Init(emuPath.c_str(), currentPartition, false);
+			DeviceHandler::Instance()->UnMount(emuPartition);
+			Nand::Instance()->Init(emuPath.c_str(), emuPartition, false);
 			Nand::Instance()->Enable_Emu();
 		}
 		gameIOS = channel.GetRequestedIOS(gameTitle);
@@ -1135,7 +1135,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 	}
 	if(!emu_disabled)
 	{
-		Nand::Instance()->Init(emuPath.c_str(), currentPartition, false);
+		Nand::Instance()->Init(emuPath.c_str(), emuPartition, false);
 		if(emulate_mode == 1)
 			Nand::Instance()->Set_FullMode(true);
 		else