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

libui/windows: don't explode if setWindowText() fails. fixes random crash when closing window. 

also add extra safety, can't hurt.
This commit is contained in:
StapleButter 2017-12-17 02:11:28 +01:00
parent 2e82a4f26a
commit e4e8d775c0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libui_sdl/libui/windows/text.cpp
View File

@ -29,8 +29,7 @@ WCHAR *windowText(HWND hwnd)
void setWindowText(HWND hwnd, WCHAR *wtext) void setWindowText(HWND hwnd, WCHAR *wtext)
{ {
if (SetWindowTextW(hwnd, wtext) == 0) SetWindowTextW(hwnd, wtext);
logLastError(L"error setting window text");
} }
void uiFreeText(char *text) void uiFreeText(char *text)

6
src/libui_sdl/main.cpp
View File

@ -755,6 +755,12 @@ void TryLoadROM(char* file, int prevstatus)
int OnCloseWindow(uiWindow* window, void* blarg) int OnCloseWindow(uiWindow* window, void* blarg)
{ {
if (RunningSomething)
{
EmuRunning = 2;
while (EmuStatus != 2);
}
uiQuit(); uiQuit();
return 1; return 1;
} }