diff options
| -rw-r--r-- | aocharmovie.cpp | 28 | ||||
| -rw-r--r-- | aomovie.cpp | 2 | ||||
| -rw-r--r-- | courtroom.cpp | 2 |
3 files changed, 13 insertions, 19 deletions
diff --git a/aocharmovie.cpp b/aocharmovie.cpp index 93c5186..d77ecb2 100644 --- a/aocharmovie.cpp +++ b/aocharmovie.cpp @@ -42,25 +42,21 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) m_movie->stop(); m_movie->setFileName(gif_path); - if (m_flipped) - { - QImageReader *reader = new QImageReader(gif_path); - - flipped_movie.clear(); - QImage f_image = reader->read(); - while (!f_image.isNull()) - { - flipped_movie.append(f_image.mirrored(true, false)); - f_image = reader->read(); - } + QImageReader *reader = new QImageReader(gif_path); - delete reader; - } - else + flipped_movie.clear(); + QImage f_image = reader->read(); + while (!f_image.isNull()) { - this->setMovie(m_movie); + if (m_flipped) + flipped_movie.append(f_image.mirrored(true, false)); + else + flipped_movie.append(f_image); + f_image = reader->read(); } + delete reader; + this->show(); m_movie->start(); } @@ -157,7 +153,7 @@ void AOCharMovie::combo_resize(int w, int h) void AOCharMovie::frame_change(int n_frame) { - if (m_flipped && flipped_movie.size() > n_frame) + if (flipped_movie.size() > n_frame) { QPixmap f_pixmap = QPixmap::fromImage(flipped_movie.at(n_frame)); diff --git a/aomovie.cpp b/aomovie.cpp index 90c3701..5714704 100644 --- a/aomovie.cpp +++ b/aomovie.cpp @@ -10,8 +10,6 @@ AOMovie::AOMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent) m_movie = new QMovie(); - this->setMovie(m_movie); - connect(m_movie, SIGNAL(frameChanged(int)), this, SLOT(frame_change(int))); } diff --git a/courtroom.cpp b/courtroom.cpp index 806753c..d4b6f96 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -1631,7 +1631,7 @@ void Courtroom::on_pos_dropdown_changed(int p_index) f_pos = ""; } - if (f_pos == "" || ui_ooc_chat_name == "") + if (f_pos == "" || ui_ooc_chat_name->text() == "") return; ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/pos " + f_pos + "#%")); |