Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an infinite hang when loading the pair character, fix strange undesired behavior of the pair character (#586)

Browse Source 
* sanity check if the frame we're waiting on isnt nonexistent

* consolidate conditionals
This commit is contained in:
Rosemary Witchaven 2021-08-24 19:37:13 -05:00 committed by GitHub
parent 9d2e00ee11
commit 8b82f5d592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/aolayer.cpp
View File

@ -304,11 +304,12 @@ void AOLayer::start_playback(QString p_image)
m_reader.setFileName(p_image); m_reader.setFileName(p_image);
if (m_reader.loopCount() == 0) if (m_reader.loopCount() == 0)
play_once = true; play_once = true;
if (!continuous)
frame = 0;
last_max_frames = max_frames; last_max_frames = max_frames;
max_frames = m_reader.imageCount(); max_frames = m_reader.imageCount();
if (((continuous) && (max_frames != last_max_frames)) || max_frames == 0) { if (!continuous
|| ((continuous) && (max_frames != last_max_frames))
|| max_frames == 0
|| frame >= max_frames) {
frame = 0; frame = 0;
continuous = false; continuous = false;
} }
@ -519,11 +520,6 @@ void CharLayer::movie_ticker()
void AOLayer::movie_ticker() void AOLayer::movie_ticker()
{ {
++frame; ++frame;
mutex.lock();
while (frame >= movie_frames.size() && frame < max_frames) { // oops! our frame isn't ready yet
frameAdded.wait(&mutex);
}
mutex.unlock();
if (frame >= max_frames) { if (frame >= max_frames) {
if (play_once) { if (play_once) {
if (cull_image) if (cull_image)
@ -536,6 +532,11 @@ void AOLayer::movie_ticker()
else else
frame = 0; frame = 0;
} }
mutex.lock();
while (frame >= movie_frames.size() && frame < max_frames) { // oops! our frame isn't ready yet
frameAdded.wait(&mutex);
}
mutex.unlock();
#ifdef DEBUG_MOVIE #ifdef DEBUG_MOVIE
qDebug() << "[AOLayer::movie_ticker] Frame:" << frame << "Delay:" << movie_delays[frame] qDebug() << "[AOLayer::movie_ticker] Frame:" << frame << "Delay:" << movie_delays[frame]
<< "Actual time taken from last frame:" << actual_time.restart(); << "Actual time taken from last frame:" << actual_time.restart();