Index: trunk/src_plugins/rbs_routing/install.c
===================================================================
--- trunk/src_plugins/rbs_routing/install.c	(revision 38833)
+++ trunk/src_plugins/rbs_routing/install.c	(revision 38834)
@@ -1,14 +1,13 @@
-static int rbsr_install_arc(rbsr_stretch_t *rbss, grbs_2net_t *tn, grbs_arc_t *arc)
+static int rbsr_install_arc(pcb_layer_t *ly, grbs_2net_t *tn, grbs_arc_t *arc)
 {
 	if (arc->user_data == NULL) { /* create new */
 		pcb_arc_t *pa;
-		pcb_layer_t *ly;
+		;
 		double cx, cy, sa, da;
 
 		if (arc->r == 0)
 			return 0; /* do not create dummy arcs used for incident lines */
 
-		ly = pcb_get_layer(rbss->map.pcb->Data, rbss->map.lid);
 		sa = 180.0 - (arc->sa * RND_RAD_TO_DEG);
 		da = - (arc->da * RND_RAD_TO_DEG);
 		cx = arc->parent_pt->x;
@@ -25,16 +24,14 @@
 	return 0;
 }
 
-static int rbsr_install_line(rbsr_stretch_t *rbss, grbs_2net_t *tn, grbs_line_t *line)
+static int rbsr_install_line(pcb_layer_t *ly, grbs_2net_t *tn, grbs_line_t *line)
 {
 	if (line->user_data == NULL) { /* create new */
 		pcb_line_t *pl;
-		pcb_layer_t *ly;
 
 		if ((line->x1 == line->x2) && (line->y1 == line->y2))
 			return 0;
 
-		ly = pcb_get_layer(rbss->map.pcb->Data, rbss->map.lid);
 		pl = pcb_line_new(ly,
 			RBSR_G2R(line->x1), RBSR_G2R(line->y1),
 			RBSR_G2R(line->x2), RBSR_G2R(line->y2),
@@ -47,7 +44,7 @@
 	return 0;
 }
 
-static int rbsr_install_pt_arcs(rbsr_stretch_t *rbss, grbs_2net_t *tn, grbs_point_t *pt)
+static int rbsr_install_pt_arcs(pcb_layer_t *ly, grbs_2net_t *tn, grbs_point_t *pt)
 {
 	int seg, res = 0;
 
@@ -54,13 +51,13 @@
 	for(seg = 0; seg < GRBS_MAX_SEG; seg++) {
 		grbs_arc_t *a = gdl_first(&pt->arcs[seg]);
 		for(a = gdl_next(&pt->arcs[seg], a) ; a != NULL; a = gdl_next(&pt->arcs[seg], a))
-			res |= rbsr_install_arc(rbss, tn, a);
+			res |= rbsr_install_arc(ly, tn, a);
 	}
 
 	return res;
 }
 
-int rbsr_install_2net(rbsr_stretch_t *rbss, grbs_2net_t *tn)
+int rbsr_install_2net(pcb_layer_t *ly, grbs_2net_t *tn)
 {
 	grbs_arc_t *a, *prev = NULL;
 	int res = 0;
@@ -67,11 +64,11 @@
 
 	for(a = gdl_first(&tn->arcs); a != NULL; prev = a, a = gdl_next(&tn->arcs, a)) {
 		if (prev != NULL)
-			res |= rbsr_install_line(rbss, tn, a->sline);
+			res |= rbsr_install_line(ly, tn, a->sline);
 
-		/* verify all arcs,their radius and angles may have changed due to new arc
+		/* verify all arcs, their radius and angles may have changed due to new arc
 		   inserted */
-		res |= rbsr_install_pt_arcs(rbss, tn, a->parent_pt);
+		res |= rbsr_install_pt_arcs(ly, tn, a->parent_pt);
 	}
 
 	return res;
Index: trunk/src_plugins/rbs_routing/stretch.c
===================================================================
--- trunk/src_plugins/rbs_routing/stretch.c	(revision 38833)
+++ trunk/src_plugins/rbs_routing/stretch.c	(revision 38834)
@@ -3,7 +3,8 @@
 
 static int rbsr_stretch_install_2net(rbsr_stretch_t *rbss, grbs_2net_t *tn)
 {
-	return rbsr_install_2net(rbss, tn);
+	pcb_layer_t *ly = pcb_get_layer(rbss->map.pcb->Data, rbss->map.lid);
+	return rbsr_install_2net(ly, tn);
 }