mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-09-15 15:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash adding/removing frames in sprites with frame tags

Browse Source
This commit is contained in:
David Capello 2015-03-11 18:45:35 -03:00
parent a9fae58a98
commit cdc9b419c7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/doc/sprite.cpp
View File

@ -359,7 +359,10 @@ void Sprite::addFrame(frame_t newFrame)
folder()->displaceFrames(newFrame, +1);
for (FrameTag* tag : m_frameTags) {
// As FrameTag::setFrameRange() changes m_frameTags, we need to use
// a copy of this collection
std::vector<FrameTag*> tags(m_frameTags.begin(), m_frameTags.end());
for (FrameTag* tag : tags) {
frame_t from = tag->fromFrame();
frame_t to = tag->toFrame();
if (newFrame <= from) { ++from; }
@ -381,7 +384,10 @@ void Sprite::removeFrame(frame_t frame)
setFrameDuration(i, frameDuration(i+1));
setTotalFrames(newTotal);
for (FrameTag* tag : m_frameTags) {
// As FrameTag::setFrameRange() changes m_frameTags, we need to use
// a copy of this collection
std::vector<FrameTag*> tags(m_frameTags.begin(), m_frameTags.end());
for (FrameTag* tag : tags) {
frame_t from = tag->fromFrame();
frame_t to = tag->toFrame();
if (frame <= from) { --from; }