Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 15631)
+++ trunk/src/crosshair.c	(revision 15632)
@@ -934,25 +934,6 @@
 			ans = PCB_TYPE_NONE;
 	}
 
-	if (ans != PCB_TYPE_NONE) {
-		pcb_pad_t *pad = (pcb_pad_t *) ptr2;
-		check_snap_object(&snap_data, (pad->Point1.X + pad->Point2.X) / 2, (pad->Point1.Y + pad->Point2.Y) / 2, pcb_true);
-		pcb_crosshair.snapped_pad = pad;
-	} else {
-		pcb_crosshair.snapped_pad = 0;
-	}
-
-	/* Avoid self-snapping when moving */
-	/* SUBC/TERM note: this behavior is wrong, let the user use shift to verride */
-
-	if (ans != PCB_TYPE_NONE) {
-		pcb_pin_t *pin = (pcb_pin_t *) ptr2;
-		check_snap_object(&snap_data, pin->X, pin->Y, pcb_true);
-		pcb_crosshair.snapped_pin = pin;
-	} else {
-		pcb_crosshair.snapped_pin = 0;
-	}
-
 	/*** padstack center ***/
 	ans = PCB_TYPE_NONE;
 	if (conf_core.editor.snap_pin)
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 15631)
+++ trunk/src/crosshair.h	(revision 15632)
@@ -82,8 +82,6 @@
 	enum pcb_crosshair_shape_e shape;			/* shape of crosshair */
 	vtop_t onpoint_objs;
 	vtop_t old_onpoint_objs;
-	pcb_pad_t *snapped_pad;
-	pcb_pin_t *snapped_pin;
 	pcb_pstk_t *snapped_pstk;