Fix #8448 properly, in case we fail to generate ID.

Limit homebrew ini file generation to UI.
hrydgard · Jun 20, 2016 · 6c14b82 · 6c14b82
1 parent 778c518
commit 6c14b82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp
@@ -39,7 +39,9 @@ static void __CheatStart() {
 
 	gameTitle = g_paramSFO.GetValueString("DISC_ID");
 
-	cheatEngine->CreateCheatFile();
+	if (gameTitle != "") { //this only generates ini files on boot, let's leave homebrew ini file for UI
+		cheatEngine->CreateCheatFile();
+	}
 
 	cheatEngine = new CWCheatEngine();
 	cheatEngine->CreateCodeList();

diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp
@@ -214,6 +214,10 @@ UI::EventReturn CwCheatScreen::OnEditCheatFile(UI::EventParams &params) {
 }
 
 UI::EventReturn CwCheatScreen::OnImportCheat(UI::EventParams &params) {
+	if (gameTitle.length() != 9) {
+		WARN_LOG(COMMON, "CWCHEAT: Incorrect ID(%s) - can't import cheats.", gameTitle.c_str());
+		return UI::EVENT_DONE;
+	}
 	std::string line;
 	std::vector<std::string> title;
 	bool finished = false, skip = false;