From f599f10a032880ecf13e7bc2e6c017e422fd18c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20W=C5=82ostowski?= <tomasz.wlostowski@cern.ch>
Date: Mon, 20 Mar 2017 11:45:34 +0100
Subject: [PATCH] gal: reset autopan state when autopanning is disabled

Fixes: lp:1674022
* https://bugs.launchpad.net/kicad/+bug/1674022
---
 common/view/wx_view_controls.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/view/wx_view_controls.cpp b/common/view/wx_view_controls.cpp
index bb10462ba6..79863d687b 100644
--- a/common/view/wx_view_controls.cpp
+++ b/common/view/wx_view_controls.cpp
@@ -278,6 +278,12 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
     {
     case AUTO_PANNING:
     {
+        if ( !m_settings.m_autoPanEnabled )
+        {
+            m_state = IDLE;
+            return;
+        }
+
 #if wxCHECK_VERSION( 3, 0, 0 )
         if( !m_parentPanel->HasFocus() )
             break;