diff options
| author | stonedDiscord <stoned@derpymail.org> | 2020-03-06 16:41:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 16:41:43 +0100 |
| commit | 8c93cce0be0a316723284349d1f618dbf770ba3f (patch) | |
| tree | 1b6f398c119ef9b5828fc3b8a5499c5d803fb660 /src | |
| parent | b44338996b2e3b1cf3b4dff8ddc859e874ae015b (diff) | |
| parent | b9aba6207122f1dd4ab466eeb298b4d2c195603d (diff) | |
Merge pull request #118 from in1tiate/pngfix
Check root of character folder for PNG emote without prefix
Diffstat (limited to 'src')
| -rw-r--r-- | src/aocharmovie.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 |