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

Fix Memory leak when switching back and forth from 64DD to N64

This commit is contained in:
LuigiBlood 2019-01-25 23:12:01 +01:00
parent c0b3246a2e
commit b1a2fcfddd
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,11 +339,6 @@ bool CN64System::LoadFileImage(const char * FileLoc)
g_Settings->SaveString(File_DiskIPLPath, FileLoc); g_Settings->SaveString(File_DiskIPLPath, FileLoc);
} }
if (g_DDRom != NULL)
{
g_Settings->SaveBool(Setting_EnableDisk, true);
}
g_System->RefreshGameSettings(); g_System->RefreshGameSettings();
if (g_Rom->CicChipID() != CIC_NUS_8303 && g_Rom->CicChipID() != CIC_NUS_DDUS) if (g_Rom->CicChipID() != CIC_NUS_8303 && g_Rom->CicChipID() != CIC_NUS_DDUS)
@ -373,11 +368,13 @@ 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. //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) if (g_Disk != NULL)
{ {
g_Disk->UnallocateDiskImage();
delete g_Disk; delete g_Disk;
g_Disk = NULL; g_Disk = NULL;
} }
if (g_DDRom != NULL) if (g_DDRom != NULL)
{ {
g_DDRom->UnallocateRomImage();
delete g_DDRom; delete g_DDRom;
g_DDRom = NULL; g_DDRom = NULL;
} }