preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14062 from unknownbrackets/ui-load-error

Browse Source 
Core: Reset state properly on CPU init failure
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2021-02-05 09:06:06 +01:00
2 parents d3d5ff0d0d 7f996f5b4b
commit 5babc1af2c
2 files changed
+9 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/System.cpp
+1
View File
@@ -412,6 +412,7 @@ bool PSP_InitStart(const CoreParameter &coreParam, std::string *error_string) {
if (!CPU_Init()) {
*error_string = "Failed initializing CPU/Memory";
pspIsIniting = false;
return false;
}
Windows/WindowsHost.cpp
+8 -3
View File
@@ -261,7 +261,8 @@ void WindowsHost::PollControllers() {
}
void WindowsHost::BootDone() {
g_symbolMap->SortSymbols();
if (g_symbolMap)
g_symbolMap->SortSymbols();
PostMessage(mainWindow_, WM_USER + 1, 0, 0);
SetDebugMode(!g_Config.bAutoRun);
@@ -295,6 +296,8 @@ static std::string SymbolMapFilename(const char *currentFilename, const char* ex
}
bool WindowsHost::AttemptLoadSymbolMap() {
if (!g_symbolMap)
return false;
bool result1 = g_symbolMap->LoadSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(),".ppmap").c_str());
// Load the old-style map file.
if (!result1)
@@ -304,11 +307,13 @@ bool WindowsHost::AttemptLoadSymbolMap() {
}
void WindowsHost::SaveSymbolMap() {
g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(),".ppmap").c_str());
if (g_symbolMap)
g_symbolMap->SaveSymbolMap(SymbolMapFilename(PSP_CoreParameter().fileToStart.c_str(),".ppmap").c_str());
}
void WindowsHost::NotifySymbolMapUpdated() {
g_symbolMap->SortSymbols();
if (g_symbolMap)
g_symbolMap->SortSymbols();
PostMessage(mainWindow_, WM_USER + 1, 0, 0);
}