thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows: Avoid segfault if memory except on boot.

Browse source
This commit is contained in:
Unknown W. Brackets 2021-03-28 19:44:17 -07:00
parent 1d413c2470
commit f8306891c5
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Core/System.cpp
View file

@ -122,7 +122,8 @@ void UpdateUIState(GlobalUIState newState) {
// Never leave the EXIT state. // Never leave the EXIT state.
if (globalUIState != newState && globalUIState != UISTATE_EXIT) { if (globalUIState != newState && globalUIState != UISTATE_EXIT) {
globalUIState = newState; globalUIState = newState;
host->UpdateDisassembly(); if (host)
host->UpdateDisassembly();
const char *state = nullptr; const char *state = nullptr;
switch (globalUIState) { switch (globalUIState) {
case UISTATE_EXIT: state = "exit"; break; case UISTATE_EXIT: state = "exit"; break;

5
Windows/Debugger/Debugger_MemoryDlg.cpp
View file

@ -131,9 +131,8 @@ void CMemoryDlg::searchBoxRedraw(std::vector<u32> results) {
} }
void CMemoryDlg::NotifyMapLoaded() void CMemoryDlg::NotifyMapLoaded() {
{ if (m_hDlg && g_symbolMap)
if (m_hDlg)
g_symbolMap->FillSymbolListBox(symListHdl, ST_DATA); g_symbolMap->FillSymbolListBox(symListHdl, ST_DATA);
Update(); Update();
} }

3
Windows/EmuThread.cpp
View file

@ -263,6 +263,9 @@ void MainThreadFunc() {
if (!Core_IsActive()) if (!Core_IsActive())
UpdateUIState(UISTATE_MENU); UpdateUIState(UISTATE_MENU);
Core_Run(g_graphicsContext); Core_Run(g_graphicsContext);
if (coreState == CORE_BOOT_ERROR) {
break;
}
} }
} }
Core_Stop(); Core_Stop();