mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 05:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lock the document when ToolLoopImpl has to commit or rollback the change

Browse Source
This commit is contained in:
David Capello 2015-04-07 17:50:57 -03:00
parent 14fed8afd5
commit 5f587af503
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/ui/editor/tool_loop_impl.cpp
View File

@ -190,7 +190,16 @@ public:
if (!m_canceled) {
// Paint ink
if (getInk()->isPaint()) {
m_expandCelCanvas.commit();
retry_commit:;
try {
ContextReader reader(m_context);
ContextWriter writer(reader);
m_expandCelCanvas.commit();
}
catch (const LockedDocumentException&) {
base::this_thread::sleep_for(0.25);
goto retry_commit;
}
}
// Selection ink
else if (getInk()->isSelection()) {
@ -205,7 +214,16 @@ public:
// If the trace was canceled or it is not a 'paint' ink...
if (m_canceled || !getInk()->isPaint()) {
m_expandCelCanvas.rollback();
retry_rollback:;
try {
ContextReader reader(m_context);
ContextWriter writer(reader);
m_expandCelCanvas.rollback();
}
catch (const LockedDocumentException&) {
base::this_thread::sleep_for(0.25);
goto retry_rollback;
}
}
delete m_brush;