libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-23 17:45:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix --state not loading a savestate on startup.

Browse Source 
Was scheduling some random event instead after 883f61e3ddafc0de17cb78f355f860e8ce4406a6.
This commit is contained in:
Unknown W. Brackets 2013-01-02 14:25:35 -08:00
parent fb487ded17
commit 65ddd4d731
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/SaveState.cpp
View File

@ -58,6 +58,7 @@ namespace SaveState
};
static int timer;
static bool needsProcess = false;
static std::vector<Operation> pending;
static std::recursive_mutex mutex;
@ -93,8 +94,10 @@ namespace SaveState
// Warning: this may run on a different thread.
Process(0, 0);
}
else
else if (__KernelIsRunning())
CoreTiming::ScheduleEvent_Threadsafe(0, timer);
else
needsProcess = true;
}
void Load(const std::string &filename, Callback callback, void *cbUserData)
@ -249,5 +252,12 @@ namespace SaveState
timer = CoreTiming::RegisterEvent("SaveState", Process);
// Make sure there's a directory for save slots
pspFileSystem.MkDir("ms0:/PSP/PPSSPP_STATE");
std::lock_guard<std::recursive_mutex> guard(mutex);
if (needsProcess)
{
CoreTiming::ScheduleEvent(0, timer);
needsProcess = false;
}
}
}