diff options
| author | Crystalwarrior <varsash@gmail.com> | 2021-01-10 14:27:27 +0300 |
|---|---|---|
| committer | Crystalwarrior <varsash@gmail.com> | 2021-01-10 14:27:27 +0300 |
| commit | 1ad8f3bf24a4e0a3dcbd0d172c9bfa1641907d7d (patch) | |
| tree | 2f4345fcc09eafa846cf5552e19e3443bdc07744 /src/aoemotebutton.cpp | |
| parent | de3533fbf2615a40efc60c9ed2e96f1a3b5da3c1 (diff) | |
| parent | e65072f8f1e885f7bbade9e9d84fbeea2ef8a097 (diff) | |
Merge branch 'master' into feature/timerclock
# Conflicts:
# include/courtroom.h
# src/courtroom.cpp
Diffstat (limited to 'src/aoemotebutton.cpp')
| -rw-r--r-- | src/aoemotebutton.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/aoemotebutton.cpp b/src/aoemotebutton.cpp index 90535607..652010d2 100644 --- a/src/aoemotebutton.cpp +++ b/src/aoemotebutton.cpp @@ -27,6 +27,7 @@ void AOEmoteButton::set_image(QString p_image, QString p_emote_comment) } else if (p_image.contains("_on") && file_exists(tmp_p_image.replace("_on", "_off"))) { QImage tmpImage(tmp_p_image); + tmpImage = tmpImage.convertToFormat(QImage::Format_ARGB32); QPoint p1, p2; p2.setY(tmpImage.height()); |