diff options
| author | Razzeee <razzeee@gmail.com> | 2017-04-14 09:03:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-14 09:03:53 +0200 |
| commit | affdfe4e1ec6b2132e2f8fb58b45b777f9a35c47 (patch) | |
| tree | 1cb7a6dad892b07bab0ba344bf5b9f6cac542356 | |
| parent | 0a0a3cfc06e7d50191291a034b09ae8e78d3972e (diff) | |
| parent | 190b3a042a8c374db62a32b700bf4410fc3a6e7c (diff) | |
Merge pull request #11379 from BigNoid/include_move
[application] load includes before fonts
| -rw-r--r-- | xbmc/Application.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index e8ca0593be..76506def8f 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -1649,6 +1649,8 @@ bool CApplication::LoadSkin(const std::string& skinID) g_colorManager.Load(m_ServiceManager->GetSettings().GetString(CSettings::SETTING_LOOKANDFEEL_SKINCOLORS)); + g_SkinInfo->LoadIncludes(); + g_fontManager.LoadFonts(m_ServiceManager->GetSettings().GetString(CSettings::SETTING_LOOKANDFEEL_FONT)); // load in the skin strings @@ -1657,7 +1659,6 @@ bool CApplication::LoadSkin(const std::string& skinID) g_localizeStrings.LoadSkinStrings(langPath, m_ServiceManager->GetSettings().GetString(CSettings::SETTING_LOCALE_LANGUAGE)); - g_SkinInfo->LoadIncludes(); int64_t start; start = CurrentHostCounter(); |