diff options
| author | Crystalwarrior <varsash@gmail.com> | 2021-04-23 16:12:35 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2021-04-23 16:12:35 +0300 |
| commit | de4115e20ab800e7ebd639cd37de6df0cd7c72f9 (patch) | |
| tree | ca681bc94843767afdec4a0c21af8e294e8a707e /src/path_functions.cpp | |
| parent | 43340e88695b2adc7b8fc8141540178727fd8869 (diff) | |
| parent | 5fca08537b6f2c6c581156c4dc07bc9ba61b17ef (diff) | |
Merge branch 'master' into crystalwarrior/demo-reload
Diffstat (limited to 'src/path_functions.cpp')
| -rw-r--r-- | src/path_functions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/path_functions.cpp b/src/path_functions.cpp index 51073494..dbf1cc40 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 != "") @@ -173,6 +173,7 @@ QString AOApplication::get_config_value(QString p_identifier, QString p_config, p = get_case_sensitive_path(p); if (file_exists(p)) { QSettings settings(p, QSettings::IniFormat); + settings.setIniCodec("UTF-8"); QVariant value = settings.value(p_identifier); if (value.type() == QVariant::StringList) { // qDebug() << "got" << p << "is a string list, returning" << value.toStringList().join(","); |