From 2b5f7d594beca92d17f518fcacc0a2d9ad8d042d Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 5 Nov 2020 19:49:30 +0000
Subject: [PATCH] Auto-zoom means auto-zoom.  Other zoom settings do not.

Fixes https://gitlab.com/kicad/code/kicad/issues/6257
---
 pcbnew/footprint_edit_frame.cpp   | 1 -
 pcbnew/footprint_editor_utils.cpp | 3 ++-
 pcbnew/initpcb.cpp                | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp
index a4e5c6176f..47356dbbe3 100644
--- a/pcbnew/footprint_edit_frame.cpp
+++ b/pcbnew/footprint_edit_frame.cpp
@@ -757,7 +757,6 @@ void FOOTPRINT_EDIT_FRAME::updateView()
     GetCanvas()->UpdateColors();
     GetCanvas()->DisplayBoard( GetBoard() );
     m_toolManager->ResetTools( TOOL_BASE::MODEL_RELOAD );
-    m_toolManager->RunAction( ACTIONS::zoomFitScreen, true );
     updateTitle();
 }
 
diff --git a/pcbnew/footprint_editor_utils.cpp b/pcbnew/footprint_editor_utils.cpp
index 5d4c30b55f..6c115bbfd5 100644
--- a/pcbnew/footprint_editor_utils.cpp
+++ b/pcbnew/footprint_editor_utils.cpp
@@ -98,7 +98,8 @@ void FOOTPRINT_EDIT_FRAME::LoadModuleFromLibrary( LIB_ID aFPID)
         }
     }
 
-    Zoom_Automatique( false );
+    if( m_zoomSelectBox->GetSelection() == 0 )
+        Zoom_Automatique( false );
 
     Update3DView( true );
 
diff --git a/pcbnew/initpcb.cpp b/pcbnew/initpcb.cpp
index a47e1a2945..2a38c94e9b 100644
--- a/pcbnew/initpcb.cpp
+++ b/pcbnew/initpcb.cpp
@@ -126,7 +126,5 @@ bool FOOTPRINT_EDIT_FRAME::Clear_Pcb( bool aQuery )
 
     GetScreen()->InitDataPoints( GetPageSizeIU() );
 
-    Zoom_Automatique( false );
-
     return true;
 }