MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

GLideNUI-wtl: Return current font if fonts are not selected

Browse Source
This commit is contained in:
zilmar 2020-04-30 17:25:04 +09:30 committed by Sergey Lipskiy
parent 4750a268ae
commit f525f8fdc0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GLideNUI-wtl/config-osd.cpp
View File

@ -239,13 +239,13 @@ void COsdTab::LoadSettings(bool /*blockCustomSettings*/)
m_OsdColor.SetColor(config.font.color[0], config.font.color[1], config.font.color[2]);
m_OsdPreview.SetColor(config.font.color[0], config.font.color[1], config.font.color[2]);
}
m_PosTopLeft.SetChecked(config.onScreenDisplay.pos == Config::posTopLeft);
m_PosTop.SetChecked(config.onScreenDisplay.pos == Config::posTopCenter);
m_PosTopLeft.SetChecked(config.onScreenDisplay.pos == Config::posTopLeft);
m_PosTop.SetChecked(config.onScreenDisplay.pos == Config::posTopCenter);
m_PosTopRight.SetChecked(config.onScreenDisplay.pos == Config::posTopRight);
m_PosBottomLeft.SetChecked(config.onScreenDisplay.pos == Config::posBottomLeft);
m_PosBottom.SetChecked(config.onScreenDisplay.pos == Config::posBottomCenter);
m_PosBottomRight.SetChecked(config.onScreenDisplay.pos == Config::posBottomRight);
m_PosBottomRight.SetChecked(config.onScreenDisplay.pos == Config::posBottomRight);
CButton(GetDlgItem(IDC_CHK_FPS)).SetCheck(config.onScreenDisplay.fps != 0 ? BST_CHECKED : BST_UNCHECKED);
CButton(GetDlgItem(IDC_CHK_VIS)).SetCheck(config.onScreenDisplay.vis != 0 ? BST_CHECKED : BST_UNCHECKED);
@ -291,6 +291,8 @@ void COsdTab::SaveSettings()
std::wstring COsdTab::GetSelectedFont()
{
if (!m_FontsLoaded)
return ToUTF16(config.font.name.c_str());
HTREEITEM hItem = m_Fonts.GetSelectedItem();
if (hItem == NULL)
return L"";