Index: tool.c
===================================================================
--- tool.c	(revision 28089)
+++ tool.c	(revision 28090)
@@ -350,13 +350,13 @@
 	pcb_notify_crosshair_change(pcb_true);
 }
 
-pcb_bool pcb_tool_should_snap_offgrid_line(pcb_layer_t *layer, pcb_line_t *line)
+pcb_bool pcb_tool_should_snap_offgrid_line(pcb_board_t *pcb, pcb_layer_t *layer, pcb_line_t *line)
 {
 	/* Allow snapping to off-grid lines when drawing new lines (on
 	 * the same layer), and when moving a line end-point
 	 * (but don't snap to the same line)
 	 */
-	if ((pcbhl_conf.editor.mode == PCB_MODE_LINE && CURRENT == layer) ||
+	if ((pcbhl_conf.editor.mode == PCB_MODE_LINE && PCB_CURRLAYER(pcb) == layer) ||
 			(pcbhl_conf.editor.mode == PCB_MODE_MOVE
 			 && pcb_crosshair.AttachedObject.Type == PCB_OBJ_LINE_POINT
 			 && pcb_crosshair.AttachedObject.Ptr1 == layer