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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2016-07-03 07:04:56 +10:00
parent 78b6f9cc66 095dfe82c9
commit 9e0459cf5a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64/UserInterface/GuiClass.cpp
View File

@ -214,8 +214,8 @@ void CMainGui::GameCpuRunning(CMainGui * Gui)
{
if (g_Settings->LoadBool(GameRunning_CPU_Running))
{
Gui->HideRomList();
Gui->MakeWindowOnTop(UISettingsLoadBool(UserInterface_AlwaysOnTop));
Gui->HideRomList();
if (UISettingsLoadBool(Setting_AutoFullscreen))
{
WriteTrace(TraceUserInterface, TraceDebug, "15");
@ -1337,4 +1337,4 @@ BOOL set_about_field(HWND hDlg, int nIDDlgItem, const wchar_t * config_string, c
swprintf(temp_string, sizeof(temp_string) / sizeof(temp_string[0]), L"%s: %s", config_string, language_string);
return SetDlgItemTextW(hDlg, nIDDlgItem, temp_string);
}
}