Merge remote-tracking branch 'upstream/master'

2 files changed, 3 insertions, 3 deletions

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 954062e..68d2fb9 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -651,7 +651,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
   }
   else if (header == "BD")
   {
-    call_notice("You are banned on this server.");
+    call_notice("You are banned on this server.\nReason: " + f_contents.at(0));
   }
   else if (header == "ZZ")
   {
diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp
index f35690a..1e920d7 100644
--- a/src/text_file_functions.cpp
+++ b/src/text_file_functions.cpp
@@ -373,10 +373,10 @@ QString AOApplication::get_sfx_suffix(QString sound_to_check)
 
 QString AOApplication::get_image_suffix(QString path_to_check)
 {
-    QString apng_check = get_sounds_path(path_to_check + ".apng");
+    QString apng_check = path_to_check + ".apng";
     if (file_exists(apng_check))
     {
-        return path_to_check + ".apng";
+        return apng_check;
     }
     return path_to_check + ".gif";
 }