mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-22 06:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash closing all files & opening a new one when preview window was playing an animation

Browse Source
This commit is contained in:
David Capello 2017-09-04 12:29:10 -03:00
parent dfa441d2a0
commit f55229f8f3
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/ui/timeline/timeline.cpp
View File

@ -338,12 +338,14 @@ void Timeline::detachDocument()
if (m_document) { if (m_document) {
m_thumbnailsPrefConn.disconnect(); m_thumbnailsPrefConn.disconnect();
m_document->remove_observer(this); m_document->remove_observer(this);
m_document = NULL; m_document = nullptr;
m_sprite = nullptr;
m_layer = nullptr;
} }
if (m_editor) { if (m_editor) {
m_editor->remove_observer(this); m_editor->remove_observer(this);
m_editor = NULL; m_editor = nullptr;
} }
invalidate(); invalidate();
@ -480,19 +482,21 @@ void Timeline::activateClipboardRange()
FrameTag* Timeline::getFrameTagByFrame(const frame_t frame) FrameTag* Timeline::getFrameTagByFrame(const frame_t frame)
{ {
if (m_tagFocusBand < 0) { if (!m_sprite)
return get_animation_tag(m_sprite, frame);
}
else {
for (FrameTag* frameTag : m_sprite->frameTags()) {
if (frame >= frameTag->fromFrame() &&
frame <= frameTag->toFrame() &&
m_tagBand[frameTag] == m_tagFocusBand) {
return frameTag;
}
}
return nullptr; return nullptr;
if (m_tagFocusBand < 0)
return get_animation_tag(m_sprite, frame);
for (FrameTag* frameTag : m_sprite->frameTags()) {
if (frame >= frameTag->fromFrame() &&
frame <= frameTag->toFrame() &&
m_tagBand[frameTag] == m_tagFocusBand) {
return frameTag;
}
} }
return nullptr;
} }
bool Timeline::onProcessMessage(Message* msg) bool Timeline::onProcessMessage(Message* msg)