From 55803c520d0a60c59cb52bac47f547a8672eb285 Mon Sep 17 00:00:00 2001 From: Skoland Date: Sat, 18 Feb 2017 08:28:31 +0100 Subject: [PATCH] attempted fixing a bug where the first frame of a preanim would display after it has played --- aocharmovie.cpp | 4 ++-- courtroom.cpp | 1 - path_functions.cpp | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/aocharmovie.cpp b/aocharmovie.cpp index 93d5d58..a596e53 100644 --- a/aocharmovie.cpp +++ b/aocharmovie.cpp @@ -157,12 +157,12 @@ void AOCharMovie::frame_change(int n_frame) if (m_movie->frameCount() - 1 == n_frame && play_once) { preanim_timer->start(m_movie->nextFrameDelay()); - //done(); + m_movie->stop(); } } void AOCharMovie::timer_done() { - qDebug() << "timer done called"; + done(); } diff --git a/courtroom.cpp b/courtroom.cpp index 5d4e133..64f1317 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -421,7 +421,6 @@ void Courtroom::set_widgets() set_size_and_pos(ui_music_list, "music_list"); ui_music_list->setStyleSheet("QListWidget{background-color: rgba(0, 0, 0, 0);}"); - ui_music_list->setFont(pt_8); set_size_and_pos(ui_ic_chat_message, "ic_chat_message"); ui_ic_chat_message->setStyleSheet("background-color: rgba(100, 100, 100, 255);"); diff --git a/path_functions.cpp b/path_functions.cpp index a6c7b86..d76a6a0 100644 --- a/path_functions.cpp +++ b/path_functions.cpp @@ -11,6 +11,8 @@ QString AOApplication::get_base_path() return "/media/omnitroid/Data/winshare/AO/client/base/"; #elif defined(OMNI_WIN_DEBUG) return "E:/AO/client/base/"; +#elif defined(OMNI_WIN_DEBUG2) + return "F:/winshare/AO/client/base/"; #else return (QDir::currentPath() + "/base/"); #endif