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 Timeline crash when there is no selected sprite

Browse Source
This commit is contained in:
David Capello 2015-03-10 18:57:34 -03:00
parent f26183a82a
commit 1780a13ed4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,7 @@ Timeline::Timeline()
, m_context(UIContext::instance())
, m_editor(NULL)
, m_document(NULL)
, m_sprite(NULL)
, m_scroll_x(0)
, m_scroll_y(0)
, m_separator_x(100 * guiscale())
@ -2268,10 +2269,13 @@ skin::SkinTheme* Timeline::skinTheme() const
int Timeline::topHeight() const
{
int h = skinTheme()->dimensions.timelineTopBorder();
if (m_sprite && !m_sprite->frameTags().empty()) {
h += getFont()->height();
h += skinTheme()->dimensions.timelineTagsAreaHeight();
int h = 0;
if (m_document && m_sprite) {
h += skinTheme()->dimensions.timelineTopBorder();
if (!m_sprite->frameTags().empty()) {
h += getFont()->height();
h += skinTheme()->dimensions.timelineTagsAreaHeight();
}
}
return h;
}