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

List:       kde-commits
Subject:    [calligra/krita-animation-pentikainen] krita/image: Don't add undo information for the frame switch 
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2015-11-04 19:00:18
Message-ID: E1Zu3IA-0002ia-8w () scm ! kde ! org
[Download RAW message or body]

Git commit 247ddc8f68bf13a48659d2997805b35064dc4629 by Dmitry Kazakov.
Committed on 04/11/2015 at 19:00.
Pushed by dkazakov into branch 'krita-animation-pentikainen'.

Don't add undo information for the frame switch if we don't actually switch anything

M  +4    -0    krita/image/kis_image_animation_interface.cpp

http://commits.kde.org/calligra/247ddc8f68bf13a48659d2997805b35064dc4629

diff --git a/krita/image/kis_image_animation_interface.cpp \
b/krita/image/kis_image_animation_interface.cpp index 33021ca..17ed445 100644
--- a/krita/image/kis_image_animation_interface.cpp
+++ b/krita/image/kis_image_animation_interface.cpp
@@ -110,6 +110,8 @@ bool KisImageAnimationInterface::externalFrameActive() const
 
 void KisImageAnimationInterface::requestTimeSwitchWithUndo(int time)
 {
+    if (m_d->currentUITime == time) return;
+
     KisSwitchCurrentTimeCommand *cmd =
         new KisSwitchCurrentTimeCommand(m_d->image, time);
 
@@ -124,6 +126,8 @@ void KisImageAnimationInterface::requestTimeSwitchNonGUI(int \
time)  
 void KisImageAnimationInterface::switchCurrentTimeAsync(int frameId)
 {
+    if (m_d->currentUITime == frameId) return;
+
     m_d->image->barrierLock();
     m_d->currentTime = frameId;
     m_d->currentUITime = frameId;


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