diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2018-12-12 13:05:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 13:05:27 -0600 |
| commit | d09269122408ee83c4fa20dfb90ed5aedd9fe85a (patch) | |
| tree | 57bb4ac47202158ac5062488151d3c83305ce424 /aomovie.cpp | |
| parent | 9270069e726d1f260e3c08ee5722f6d07067b770 (diff) | |
| parent | 171196885d88360c8c06def67ae398c8187dfd89 (diff) | |
Merge pull request #38 from Cerapter/mega-merge-fixes
CC-original related feature fixes.
Diffstat (limited to 'aomovie.cpp')
| -rw-r--r-- | aomovie.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aomovie.cpp b/aomovie.cpp index 97ee2489..edf5bdb0 100644 --- a/aomovie.cpp +++ b/aomovie.cpp @@ -39,10 +39,10 @@ void AOMovie::play(QString p_gif, QString p_char, QString p_custom_theme) QString placeholder_path = ao_app->get_theme_path("placeholder.gif"); QString default_placeholder_path = ao_app->get_default_theme_path("placeholder.gif"); - if (file_exists(misc_path)) - gif_path = misc_path; - else if (file_exists(custom_path)) + if (file_exists(custom_path)) gif_path = custom_path; + else if (file_exists(misc_path)) + gif_path = misc_path; else if (file_exists(custom_theme_path)) gif_path = custom_theme_path; else if (file_exists(theme_path)) |