From 740c03e717a1faf5c8b79867c68843756c8f1e7f Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Wed, 2 Feb 2011 11:52:00 +0100
Subject: [PATCH] Fix bug 711751.

---
 pcbnew/locate.cpp                    | 24 ++++++++----------------
 pcbnew/magnetic_tracks_functions.cpp |  3 ++-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pcbnew/locate.cpp b/pcbnew/locate.cpp
index 00ac3484eb..b1c3ec5c70 100644
--- a/pcbnew/locate.cpp
+++ b/pcbnew/locate.cpp
@@ -112,22 +112,16 @@ D_PAD* Locate_Pad_Connecte( BOARD* Pcb, TRACK* ptr_piste, int extr )
 
 
 /*
- * Locate pad pointed to by the coordinates ref_pos.x,, ref_pos.y or
- * the mouse, search done on all tracks.
- * Input:
- * - mouse coord or ref_pos
+ * Locate a pad pointed to by the coordinates ref_pos.x, ref_pos.y
+ * aLayerMask is allowed layers ( bitmap mask)
  * Returns:
- * Pointer to the pad if found.
- * NULL pointer if pad NOT FOUND
- * Num_empr = number of fingerprint pad
- *
- * Priority is the active layer
+ * Pointer to a pad if found or NULL
  */
 D_PAD* Locate_Any_Pad( BOARD* Pcb, const wxPoint& ref_pos, int aLayerMask )
 {
     D_PAD* pad = NULL;
 
-    for( MODULE* module=Pcb->m_Modules;   module && ( pad == NULL );   module = module->Next() )
+    for( MODULE* module=Pcb->m_Modules; module && ( pad == NULL ); module = module->Next() )
     {
         if( aLayerMask )
             pad = Locate_Pads( module, ref_pos, aLayerMask );
@@ -139,14 +133,12 @@ D_PAD* Locate_Any_Pad( BOARD* Pcb, const wxPoint& ref_pos, int aLayerMask )
 }
 
 
-/* Locate pad pointed to by the coordinate ref_pos.x,, ref_pos.y or
- * the mouse on the current footprint.
+/* Locate the pad pointed to by the coordinate ref_pos.x,, ref_pos.y
  * Input:
- * - General parameters of the footprint update by characters()
- * - = Masque_layer layer(s) (bit_masque) which must be the pad
+ * - the footprint to test
+ * - masque_layer layer(s) (bit_masque) which must be the pad
  * Returns:
- * A pointer to the pad if found
- * NULL pointer if pad NOT FOUND
+ * A pointer to the pad if found or NULL
  */
 D_PAD* Locate_Pads( MODULE* module, const wxPoint& ref_pos, int masque_layer )
 {
diff --git a/pcbnew/magnetic_tracks_functions.cpp b/pcbnew/magnetic_tracks_functions.cpp
index 4b8bcb30da..e2919f5adb 100644
--- a/pcbnew/magnetic_tracks_functions.cpp
+++ b/pcbnew/magnetic_tracks_functions.cpp
@@ -152,7 +152,8 @@ bool Magnetize( BOARD* m_Pcb, WinEDA_PcbFrame* frame, int aCurrentTool, wxSize g
 
     if( doPad )
     {
-        D_PAD* pad = Locate_Any_Pad( m_Pcb, pos, screen->m_Active_Layer );
+        int layer_mask = g_TabOneLayerMask[screen->m_Active_Layer];
+        D_PAD* pad = Locate_Any_Pad( m_Pcb, pos, layer_mask );
 
         if( pad )
         {