diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2021-04-23 01:57:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 01:57:24 -0500 |
| commit | b7585a1c6f67ae1f5754f0abb054edff9e03bfa4 (patch) | |
| tree | 992250b4953235731df669ec492aaf7fbebf078a /src/path_functions.cpp | |
| parent | 9fbe899c0e6ff464d91c2b2171eebb8fb879facb (diff) | |
| parent | 2c259a6337c66eb5900d2c46534c75e9d77586c1 (diff) | |
Merge pull request #533 from AttorneyOnline/fix/regression-charlayer-path
Fix regression that won't allow us to give a direct base/ path to a char emote
Diffstat (limited to 'src/path_functions.cpp')
| -rw-r--r-- | src/path_functions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/path_functions.cpp b/src/path_functions.cpp index 51073494..79851c11 100644 --- a/src/path_functions.cpp +++ b/src/path_functions.cpp @@ -105,7 +105,6 @@ QString AOApplication::get_evidence_path(QString p_file) QStringList AOApplication::get_asset_paths(QString p_element, QString p_theme, QString p_subtheme, QString p_default_theme, QString p_misc, QString p_character, QString p_placeholder) { QStringList pathlist; - pathlist += p_element; // The path by itself if (p_character != "") pathlist += get_character_path(p_character, p_element); // Character folder if (p_misc != "" && p_theme != "" && p_subtheme != "") @@ -120,6 +119,7 @@ QStringList AOApplication::get_asset_paths(QString p_element, QString p_theme, Q pathlist += get_theme_path(p_element, p_theme); // Theme path if (p_default_theme != "") pathlist += get_theme_path(p_element, p_default_theme); // Default theme path + pathlist += p_element; // The path by itself if (p_placeholder != "" && p_theme != "") pathlist += get_theme_path(p_placeholder, p_theme); // Placeholder path if (p_placeholder != "" && p_default_theme != "") |