From 59bac06efe2045271571423983fe5a280f9ce2f7 Mon Sep 17 00:00:00 2001 From: mtabachenko Date: Mon, 27 May 2013 16:25:35 +0000 Subject: [PATCH] - revert r4643 --- desmume/src/windows/main.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 75ccc2276..53bc32671 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -292,7 +292,6 @@ bool bSocketsAvailable = false; #endif VideoInfo video; -bool bRefreshDisplay = false; #ifdef HAVE_WX #include "wx/wxprec.h" @@ -1976,9 +1975,6 @@ static void DoDisplay(bool firstTime) void displayProc() { - if (!bRefreshDisplay && !execute) return; - bRefreshDisplay = false; - g_mutex_lock(display_mutex); //find a buffer to display @@ -2456,16 +2452,6 @@ static BOOL LoadROM(const char * filename, const char * physicalName, const char Pause(); //if (strcmp(filename,"")!=0) INFO("Attempting to load ROM: %s\n",filename); - //since loading a rom can take a long time and happens in the main thread, forcibly display a message here so users dont think it froze - video.clear(); - osd->clear(); - osd->addFixed(70, 80, "Loading ROM."); - osd->addFixed(70, 100, "Please wait..."); - osd->addFixed(70, 192 + 80, "Loading ROM."); - osd->addFixed(70, 192 + 100, "Please wait..."); - bRefreshDisplay = true; - Display(); - if (NDS_LoadROM(filename, physicalName, logicalName) > 0) { INFO("Loading %s was successful\n",logicalName); @@ -4031,7 +4017,6 @@ void CloseRom() MainWindowToolbar->EnableButton(IDM_CLOSEROM, false); MainWindowToolbar->EnableButton(IDM_RESET, false); MainWindowToolbar->ChangeButtonBitmap(IDM_PAUSE, IDB_PLAY); - bRefreshDisplay = false; } int GetInitialModifiers(int key) // async version for input thread @@ -4978,7 +4963,6 @@ DOKEYDOWN: } break; } - bRefreshDisplay = true; return 0; case WM_PAINT: {