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

Fix a segfault caused by animated desks and switching to area without a desk (#718)

Browse Source 
* Fix a segfault caused by animated desks because aolayer did not make sure that movie_delays is not empty
This happened because kill() did not actually reset the max_frames. Fix that too.

* do the thingy longbyte said
This commit is contained in:
Crystalwarrior 2022-05-21 17:17:24 +03:00 committed by GitHub
parent a1edef048f
commit 8657f7c2a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/aolayer.cpp
View File

@ -383,9 +383,9 @@ void AOLayer::play()
this->freeze();
}
else {
while (movie_delays.size() <= frame) {
frameAdded.wait(&mutex);
}
while (movie_delays.size() <= frame) {
frameAdded.wait(&mutex);
}
ticker->start(this->get_frame_delay(movie_delays[frame]));
}
}
@ -531,6 +531,8 @@ void AOLayer::kill()
this->clear();
movie_frames.clear();
movie_delays.clear();
last_max_frames = max_frames;
max_frames = 0;
last_path = "";
}