From 59ec9700c66330f69f64c2f3c75f5a31358524fe Mon Sep 17 00:00:00 2001 From: zeromus Date: Sat, 4 Jun 2011 17:04:46 +0000 Subject: [PATCH] win: fix [3311520], which causes MPCF path to get initialized wrongly and the whole c:\ drive to get scanned sometimes --- desmume/src/windows/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 8e84bf255..763511623 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -2569,8 +2569,6 @@ int _main() CommonSettings.cheatsDisable = GetPrivateProfileBool("General", "cheatsDisable", false, IniName); - WIN_InstallCFlash(); - ColorCtrl_Register(); if (!RegWndClass("DeSmuME", WindowProcedure, CS_DBLCLKS, LoadIcon(hAppInst, MAKEINTRESOURCE(ICONDESMUME)))) { @@ -2759,7 +2757,8 @@ int _main() GetPrivateProfileString("GBAslot.GBAgame", "filename", "", GBAgameName, MAX_PATH, IniName); cmdline.process_addonCommands(); - + WIN_InstallCFlash(); + switch (slot1_device_type) { case NDS_SLOT1_NONE: