diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/itemdb.cpp | 1 | ||||
| -rw-r--r-- | src/resources/theme.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 8a703bc7..b167e956 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -322,6 +322,7 @@ void ItemDB::unload() delete_all(mItemInfos); mItemInfos.clear(); + mNamedItemInfos.clear(); mLoaded = false; } diff --git a/src/resources/theme.cpp b/src/resources/theme.cpp index 6633f1e0..0316b0bf 100644 --- a/src/resources/theme.cpp +++ b/src/resources/theme.cpp @@ -326,6 +326,7 @@ bool Theme::tryThemePath(std::string themePath) if (!themePath.empty()) { themePath = defaultThemePath + themePath; + if (PHYSFS_exists(themePath.c_str())) { mThemePath = themePath; @@ -338,6 +339,9 @@ bool Theme::tryThemePath(std::string themePath) void Theme::prepareThemePath() { + // Ensure the Theme object has been created + instance(); + // Try theme from settings if (!tryThemePath(config.getStringValue("theme"))) // Try theme from branding |