From f63b746c739819c15d0a9bc337fae3b176229514 Mon Sep 17 00:00:00 2001 From: luigiblood Date: Mon, 1 Feb 2016 01:31:14 +0100 Subject: [PATCH] [64DD] Load 64DD IPL on g_DDRom seperately Fixes double g_Rom delete which makes Windows not happy. --- Source/Project64-core/N64System/N64Class.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Project64-core/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64Class.cpp index 9b49a8fb2..448d7732f 100644 --- a/Source/Project64-core/N64System/N64Class.cpp +++ b/Source/Project64-core/N64System/N64Class.cpp @@ -219,7 +219,9 @@ bool CN64System::RunFileImage(const char * FileLoc) if (g_Rom->CicChipID() == CIC_NUS_8303) { //64DD IPL - g_DDRom = g_Rom; + if (g_DDRom == NULL) + g_DDRom = new CN64Rom(); + g_DDRom->LoadN64ImageIPL(FileLoc); g_Settings->SaveString(File_DiskIPLPath, FileLoc); }