ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Uninitialize g_Disk and g_DDRom to prevent exception when ending emulation of a regular ROM after playing 64DD content previously.

This commit is contained in:
LuigiBlood 2019-01-25 22:53:50 +01:00
parent 40841f0d71
commit f300fd9cb5
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Project64-core/N64System/N64Class.cpp
View File

@ -370,6 +370,17 @@ bool CN64System::LoadFileImage(const char * FileLoc)
bool CN64System::RunFileImage(const char * FileLoc) bool CN64System::RunFileImage(const char * FileLoc)
{ {
//Uninitialize g_Disk and g_DDRom to prevent exception when ending emulation of a regular ROM after playing 64DD content previously.
if (g_Disk != NULL)
{
delete g_Disk;
g_Disk = NULL;
}
if (g_DDRom != NULL)
{
delete g_DDRom;
g_DDRom = NULL;
}
if (!LoadFileImage(FileLoc)) if (!LoadFileImage(FileLoc))
{ {
return false; return false;