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

winport: 

- fix app. crash on some systems introduced in r4643;
This commit is contained in:
mtabachenko 2013-05-15 18:03:31 +00:00
parent 42b51f4e45
commit 01756f15f4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,6 +292,7 @@ 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"
@ -1898,9 +1899,11 @@ static void DoDisplay(bool firstTime)
} }
} }
void displayProc(bool force = false) void displayProc()
{ {
if (!force && !execute) return; 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
@ -2384,7 +2387,8 @@ static BOOL LoadROM(const char * filename, const char * physicalName, const char
osd->addFixed(90, 100, "Please, wait..."); osd->addFixed(90, 100, "Please, wait...");
osd->addFixed(90, 192 + 80, "Loading ROM."); osd->addFixed(90, 192 + 80, "Loading ROM.");
osd->addFixed(90, 192 + 100, "Please, wait..."); osd->addFixed(90, 192 + 100, "Please, wait...");
displayProc(true); 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);
@ -3950,6 +3954,7 @@ 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
@ -4875,7 +4880,7 @@ DOKEYDOWN:
} }
break; break;
} }
displayProc(true); bRefreshDisplay = true;
return 0; return 0;
case WM_PAINT: case WM_PAINT:
{ {