mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-06 14:15:41 +12:00
Merge pull request #384 from wheremyfoodat/hlep
Test to fix android build
This commit is contained in:
commit
ca1c42c280
2 changed files with 2 additions and 1 deletions
|
@ -48,6 +48,8 @@ struct Scheduler {
|
|||
|
||||
// Clear any pending events
|
||||
events.clear();
|
||||
addEvent(Scheduler::EventType::VBlank, arm11Clock / 60);
|
||||
|
||||
// Add a dummy event to always keep the scheduler non-empty
|
||||
addEvent(EventType::Panic, std::numeric_limits<u64>::max());
|
||||
}
|
||||
|
|
|
@ -48,7 +48,6 @@ void Emulator::reset(ReloadOption reload) {
|
|||
memory.reset();
|
||||
// Reset scheduler and add a VBlank event
|
||||
scheduler.reset();
|
||||
scheduler.addEvent(Scheduler::EventType::VBlank, CPU::ticksPerSec / 60);
|
||||
|
||||
// Kernel must be reset last because it depends on CPU/Memory state
|
||||
kernel.reset();
|
||||
|
|
Loading…
Add table
Reference in a new issue