From 465e8a9d0bb4e90f9988c3786884af1c82ab6ead Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 22 Jan 2018 12:06:15 +0100 Subject: [PATCH] osd-setup: start browsing for fonts in same dir were active font is located Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e900d6610e3c6d9ad71ea9040a8fd42604dcf411 Author: vanhofen Date: 2018-01-22 (Mon, 22 Jan 2018) Origin message was: ------------------ - osd-setup: start browsing for fonts in same dir were active font is located ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osd_setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index a423ff2d5..2f7dfbec9 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -256,7 +256,7 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) CFileFilter fileFilter; fileFilter.addFilter("ttf"); fileBrowser.Filter = &fileFilter; - if (fileBrowser.exec(FONTDIR) == true) + if (fileBrowser.exec(getPathName(g_settings.font_file).c_str()) == true) { g_settings.font_file = fileBrowser.getSelectedFile()->Name; printf("[neutrino] new font file %s\n", fileBrowser.getSelectedFile()->Name.c_str()); @@ -272,7 +272,7 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) CFileFilter fileFilter; fileFilter.addFilter("ttf"); fileBrowser.Filter = &fileFilter; - if (fileBrowser.exec(FONTDIR) == true) + if (fileBrowser.exec(getPathName(g_settings.ttx_font_file).c_str()) == true) { g_settings.ttx_font_file = fileBrowser.getSelectedFile()->Name; ttx_font_file = fileBrowser.getSelectedFile()->Name;