[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] krita/ui: Revert "The image should be locked when saved to Kra format"
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2013-08-31 18:45:08
Message-ID: E1VFqAW-0003G1-KE () scm ! kde ! org
[Download RAW message or body]

Git commit b0c59b4391df28b846c36ef96b056d813d880df2 by Dmitry Kazakov.
Committed on 31/08/2013 at 18:43.
Pushed by dkazakov into branch 'master'.

Revert "The image should be locked when saved to Kra format"

This reverts commit 7a4a2745cd42a8ab931ec8651bbe823c7efb2c07.

This causes a deadlock when doing autosave!

M  +1    -3    krita/ui/kis_doc2.cc

http://commits.kde.org/calligra/b0c59b4391df28b846c36ef96b056d813d880df2

diff --git a/krita/ui/kis_doc2.cc b/krita/ui/kis_doc2.cc
index b063a97..0505c86 100644
--- a/krita/ui/kis_doc2.cc
+++ b/krita/ui/kis_doc2.cc
@@ -211,9 +211,8 @@ QDomDocument KisDoc2::saveXML()
     root.setAttribute("syntaxVersion", "2");
 
     Q_ASSERT(m_d->kraSaver == 0);
-
-    m_d->image->barrierLock();
     m_d->kraSaver = new KisKraSaver(this);
+
     root.appendChild(m_d->kraSaver->saveXML(doc, m_d->image));
 
     return doc;
@@ -291,7 +290,6 @@ bool KisDoc2::completeSaving(KoStore *store)
 
     delete m_d->kraSaver;
     m_d->kraSaver = 0;
-    m_d->image->unlock();
 
     return true;
 }
[prev in list] [next in list] [prev in thread] [next in thread]