Index: rubberband.c
===================================================================
--- rubberband.c	(revision 9892)
+++ rubberband.c	(revision 9893)
@@ -694,7 +694,7 @@
 		{
 			pcb_layer_t *layer = (pcb_layer_t *) Ptr1;
 			pcb_line_t *line = (pcb_line_t *) Ptr2;
-			if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, layer)) & PCB_LYT_COPPER) {
+			if (pcb_layer_flags_(PCB, layer) & PCB_LYT_COPPER) {
 				CheckLinePointForRubberbandConnection(rbnd, layer, line, &line->Point1, pcb_false);
 				CheckLinePointForRubberbandConnection(rbnd, layer, line, &line->Point2, pcb_false);
 			}
@@ -702,7 +702,7 @@
 		}
 
 	case PCB_TYPE_LINE_POINT:
-		if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER)	{
+		if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER)	{
 			CheckLinePointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3, pcb_true);
 			CheckLinePointForRubberbandArcConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_line_t *) Ptr2, (pcb_point_t *) Ptr3, pcb_true);
 		}
@@ -709,12 +709,12 @@
 		break;
 
 	case PCB_TYPE_ARC_POINT:
-		if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER)
+		if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER)
 			CheckArcPointForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, (int *) Ptr3, pcb_true);
 		break;
 
 	case PCB_TYPE_ARC:
-		if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER)
+		if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER)
 			CheckArcForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_arc_t *) Ptr2, pcb_true);
 		break;
 
@@ -723,7 +723,7 @@
 		break;
 
 	case PCB_TYPE_POLYGON:
-		if (pcb_layer_flags(PCB, pcb_layer_id(PCB->Data, (pcb_layer_t *) Ptr1)) & PCB_LYT_COPPER)
+		if (pcb_layer_flags_(PCB, (pcb_layer_t *) Ptr1) & PCB_LYT_COPPER)
 			CheckPolygonForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_polygon_t *) Ptr2);
 		break;
 	}