Backport:

don't start QTimeLine if QTimeLine is already started

svn path=/branches/KDE/4.0/kdebase/apps/; revision=757961

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index f119f9d92a2c087a0ef42bfea4948e004a103598..bfbc5d9f135e3fab954cc17416a5b4023361a3a6 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -503,7 +503,8 @@ void DolphinColumnView::assureVisibleActiveColumn()
         } else {
             m_animation->setFrameRange(-m_contentX, -newContentX);
         }
         } else {
             m_animation->setFrameRange(-m_contentX, -newContentX);
         }

-        m_animation->start();
+        if(m_animation->state() != QTimeLine::Running)
+           m_animation->start();

     } else if (x < 0) {
         const int newContentX = m_contentX - x;
         if (isRightToLeft()) {
     } else if (x < 0) {
         const int newContentX = m_contentX - x;
         if (isRightToLeft()) {


@@ -511,7 +512,8 @@ void DolphinColumnView::assureVisibleActiveColumn()
         } else {
             m_animation->setFrameRange(-m_contentX, -newContentX);
         }
         } else {
             m_animation->setFrameRange(-m_contentX, -newContentX);
         }

-        m_animation->start();
+        if(m_animation->state() != QTimeLine::Running)
+           m_animation->start();

     }
 }
 
     }
 }