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

wait for thread to finish before starting new one

Browse Source
This commit is contained in:
in1tiate 2021-08-11 20:14:35 -05:00
parent 42760bc3f8
commit 2a18c1cdec
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/aolayer.h
View File

@ -143,6 +143,9 @@ protected:
// Populates the frame and delay vectors with the next frame's data. // Populates the frame and delay vectors with the next frame's data.
void load_next_frame(); void load_next_frame();
// used in load_next_frame
QFuture<void> future;
signals: signals:
void done(); void done();

2
src/aolayer.cpp
View File

@ -529,8 +529,8 @@ void CharLayer::movie_ticker()
void AOLayer::movie_ticker() void AOLayer::movie_ticker()
{ {
++frame; ++frame;
QFuture<void> future;
if (frame >= movie_frames.size() && frame < max_frames) { // need to load the image if (frame >= movie_frames.size() && frame < max_frames) { // need to load the image
future.waitForFinished(); // Do Not want this to be running twice
future = QtConcurrent::run(this, &AOLayer::load_next_frame); future = QtConcurrent::run(this, &AOLayer::load_next_frame);
} }
else if (frame >= max_frames) { else if (frame >= max_frames) {