Merge pull request #607 from AttorneyOnline/cache-fix-2

Fix non-image files being loaded as images, fix custom shout button appearing on characters without it enabled

2 files changed, 4 insertions, 1 deletions

diff --git a/src/file_functions.cpp b/src/file_functions.cpp
index 37cdc32c..95e9b5f4 100644
--- a/src/file_functions.cpp
+++ b/src/file_functions.cpp
@@ -12,6 +12,9 @@ bool file_exists(QString file_path)
 
 bool dir_exists(QString dir_path)
 {
+  if (dir_path == "")
+      return false;
+
   QDir check_dir(dir_path);
 
   return check_dir.exists();
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index aedf3b8a..d873b3c1 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -517,7 +517,7 @@ QString AOApplication::get_sfx_suffix(VPath sound_to_check)
 
 QString AOApplication::get_image_suffix(VPath path_to_check, bool static_image)
 {
-  QStringList suffixes { "" };
+  QStringList suffixes {};
   if (!static_image) {
     suffixes.append({ ".webp", ".apng", ".gif" });
   }