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

- revert r4643

This commit is contained in:
mtabachenko 2013-05-27 16:25:35 +00:00
parent 65b31c7ad6
commit 59bac06efe
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desmume/src/windows/main.cpp
View File

@ -292,7 +292,6 @@ bool bSocketsAvailable = false;
#endif #endif
VideoInfo video; VideoInfo video;
bool bRefreshDisplay = false;
#ifdef HAVE_WX #ifdef HAVE_WX
#include "wx/wxprec.h" #include "wx/wxprec.h"
@ -1976,9 +1975,6 @@ static void DoDisplay(bool firstTime)
void displayProc() void displayProc()
{ {
if (!bRefreshDisplay && !execute) return;
bRefreshDisplay = false;
g_mutex_lock(display_mutex); g_mutex_lock(display_mutex);
//find a buffer to display //find a buffer to display
@ -2456,16 +2452,6 @@ static BOOL LoadROM(const char * filename, const char * physicalName, const char
Pause(); Pause();
//if (strcmp(filename,"")!=0) INFO("Attempting to load ROM: %s\n",filename); //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) if (NDS_LoadROM(filename, physicalName, logicalName) > 0)
{ {
INFO("Loading %s was successful\n",logicalName); INFO("Loading %s was successful\n",logicalName);
@ -4031,7 +4017,6 @@ void CloseRom()
MainWindowToolbar->EnableButton(IDM_CLOSEROM, false); MainWindowToolbar->EnableButton(IDM_CLOSEROM, false);
MainWindowToolbar->EnableButton(IDM_RESET, false); MainWindowToolbar->EnableButton(IDM_RESET, false);
MainWindowToolbar->ChangeButtonBitmap(IDM_PAUSE, IDB_PLAY); MainWindowToolbar->ChangeButtonBitmap(IDM_PAUSE, IDB_PLAY);
bRefreshDisplay = false;
} }
int GetInitialModifiers(int key) // async version for input thread int GetInitialModifiers(int key) // async version for input thread
@ -4978,7 +4963,6 @@ DOKEYDOWN:
} }
break; break;
} }
bRefreshDisplay = true;
return 0; return 0;
case WM_PAINT: case WM_PAINT:
{ {