empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed null reference when trying to save a state after starting another game

Browse source
This commit is contained in:
Souryo 2014-07-01 22:58:04 -04:00
parent 7268a6426c
commit f68f1c5a2d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Core/Console.cpp
View file

@ -14,9 +14,6 @@ Console::Console(wstring filename)
{
_romFilename = filename;
Console::PauseFlag.clear();
Console::RunningFlag.clear();
_mapper = MapperFactory::InitializeFromFile(filename);
_memoryManager.reset(new MemoryManager(_mapper));
_cpu.reset(new CPU(_memoryManager.get()));
@ -32,6 +29,8 @@ Console::Console(wstring filename)
ResetComponents(false);
Console::PauseFlag.clear();
Console::RunningFlag.clear();
Console::Instance = this;
}
@ -40,7 +39,9 @@ Console::~Console()
Movie::Stop();
Console::PauseFlag.clear();
Console::RunningFlag.clear();
Console::Instance = nullptr;
if(Console::Instance == this) {
Console::Instance = nullptr;
}
}
void Console::Reset()