fixed crashes and looping talking emotes

2 files changed, 5 insertions, 1 deletions

diff --git a/aocharmovie.cpp b/aocharmovie.cpp
index fbaf6365..5a455c73 100644
--- a/aocharmovie.cpp
+++ b/aocharmovie.cpp
@@ -76,11 +76,13 @@ void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration)
 
 void AOCharMovie::play_talking(QString p_char, QString p_emote)
 {
+  play_once = false;
   play(p_char, p_emote, "(b)");
 }
 
 void AOCharMovie::play_idle(QString p_char, QString p_emote)
 {
+  play_once = false;
   play(p_char, p_emote, "(a)");
 }
 
diff --git a/courtroom.cpp b/courtroom.cpp
index 52bac1d0..ca201859 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -839,6 +839,8 @@ void Courtroom::append_server_chatmessage(QString f_message)
 
 void Courtroom::on_chat_return_pressed()
 {
+  qDebug() << "anim_state: " << anim_state;
+
   if (ui_ic_chat_message->text() == "" || is_muted)
     return;
 
@@ -1233,8 +1235,8 @@ void Courtroom::chat_tick()
     chat_tick_timer->stop();
     if (anim_state == 2)
     {
-      ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]);
       anim_state = 3;
+      ui_vp_player_char->play_idle(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE]);
     }
   }