mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix progress bar applying filters (fix #2152, related to 1659401642)

Browse Source 
Regression introduced in 4264f199cd
This commit is contained in:
David Capello 2019-09-25 14:33:56 -03:00
parent f4bf7a22a3
commit 6adbf899d4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1535,9 +1535,10 @@ void Timeline::onPaint(ui::PaintEvent& ev)
goto paintNoDoc;
try {
// Lock the sprite to read/render it. We wait 1/4 secs in case
// the background thread is making a backup.
const DocReader docReader(m_document, 250);
// Lock the sprite to read/render it. Here we don't wait if the
// document is locked (e.g. a filter is being applied to the
// sprite) to avoid locking the UI.
const DocReader docReader(m_document, 0);
if (m_redrawMarchingAntsOnly) {
drawClipboardRange(g);
@ -1676,6 +1677,8 @@ void Timeline::onPaint(ui::PaintEvent& ev)
#endif
}
catch (const LockedDocException&) {
// The sprite is locked, so we defer the rendering of the sprite
// for later.
noDoc = true;
defer_invalid_rect(g->getClipBounds().offset(bounds().origin()));
}