From 21314271aeffa001cac56e81c3b8feb5b944349d Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 5 Mar 2020 20:14:53 -0600 Subject: [PATCH 1/2] Add condition for classic PNG folders --- src/aocharmovie.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp index 6aa6e35..e84c493 100644 --- a/src/aocharmovie.cpp +++ b/src/aocharmovie.cpp @@ -21,6 +21,7 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) apng = false; QString original_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".gif"); QString alt_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".png"); + QString alt_path_still = ao_app->get_character_path(p_char, p_emote + ".png"); QString apng_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".apng"); QString placeholder_path = ao_app->get_theme_path("placeholder.gif"); QString placeholder_default_path = ao_app->get_default_theme_path("placeholder.gif"); @@ -36,6 +37,8 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) gif_path = original_path; else if (file_exists(alt_path)) gif_path = alt_path; + else if (file_exists(alt_path_still)) + gif_path = alt_path_still; else if (file_exists(placeholder_path)) gif_path = placeholder_path; else From b9aba6207122f1dd4ab466eeb298b4d2c195603d Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 5 Mar 2020 23:01:40 -0600 Subject: [PATCH 2/2] added file to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7d8fd4e..8530700 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.dll *.so *.pro.autosave +*.pro.user base_override.h .DS_Store