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

List:       kde-commits
Subject:    [calligra/krita-chili-kazakov] krita/ui/canvas: Fix logic of conditionals (resolves gcc's warning)
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2014-10-17 11:29:41
Message-ID: E1Xf5j3-0007RF-R6 () scm ! kde ! org
[Download RAW message or body]

Git commit f79c23be699b67fb374debb32340c3ad021d9f26 by Dmitry Kazakov.
Committed on 17/10/2014 at 11:22.
Pushed by dkazakov into branch 'krita-chili-kazakov'.

Fix logic of conditionals (resolves gcc's warning)

M  +2    -2    krita/ui/canvas/kis_infinity_manager.cpp

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

diff --git a/krita/ui/canvas/kis_infinity_manager.cpp b/krita/ui/canvas/kis_infinity_manager.cpp
index 58017e6..e3f9758 100644
--- a/krita/ui/canvas/kis_infinity_manager.cpp
+++ b/krita/ui/canvas/kis_infinity_manager.cpp
@@ -113,12 +113,12 @@ void KisInfinityManager::imagePositionChanged()
         visible = true;
     }
 
-    if (visible && !m_filteringEnabled && this->visible()) {
+    if (!m_filteringEnabled && visible && this->visible()) {
         view()->canvasBase()->inputManager()->attachPriorityEventFilter(this);
         m_filteringEnabled = true;
     }
 
-    if (!visible && m_filteringEnabled || !this->visible()) {
+    if (m_filteringEnabled && (!visible || !this->visible())) {
         view()->canvasBase()->inputManager()->detachPriorityEventFilter(this);
         m_filteringEnabled = false;
     }
[prev in list] [next in list] [prev in thread] [next in thread]