Fix wrong precedence order for effects

This was causing the realization.png UI button to be loaded instead of the effect.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index 59b684f4..a0caf9b8 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -875,14 +875,15 @@ QString AOApplication::get_effect(QString effect, QString p_char,
   if (p_folder == "")
     p_folder = read_char_ini(p_char, "effects", "Options");
 
-  QString p_path = get_image("effects/" + effect, current_theme, get_subtheme(), default_theme, "");
-  QString p_misc_path = get_image(effect, current_theme, get_subtheme(), default_theme, p_folder);
+  QStringList paths {
+    get_image("effects/" + effect, current_theme, get_subtheme(), default_theme, ""),
+    get_image(effect, current_theme, get_subtheme(), default_theme, p_folder)
+  };
 
-  if (!file_exists(p_misc_path) && !file_exists(p_path))
-    return "";
-  else if (file_exists(p_misc_path))
-    return p_misc_path;
-  return p_path;
+  for (const auto &p : paths)
+    if (file_exists(p))
+      return p;
+  return {};
 }
 
 QString AOApplication::get_effect_property(QString fx_name, QString p_char,