Index: cli_line.c
===================================================================
--- cli_line.c	(revision 28107)
+++ cli_line.c	(revision 28108)
@@ -47,7 +47,7 @@
 	res = line_parse(line, argc, argv, &box, 1, 0);
 	if (res == 0) {
 		pcb_trace("line_exec: %mm;%mm -> %mm;%mm\n", box.X1, box.Y1, box.X2, box.Y2);
-		pcb_line_new(CURRENT, box.X1, box.Y1, box.X2, box.Y2,
+		pcb_line_new(PCB_CURRLAYER(PCB), box.X1, box.Y1, box.X2, box.Y2,
 			conf_core.design.line_thickness, 2 * conf_core.design.clearance,
 			pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0));
 	}
Index: ddraft.c
===================================================================
--- ddraft.c	(revision 28107)
+++ ddraft.c	(revision 28108)
@@ -453,7 +453,7 @@
 	}
 
 	if (pcb_ddraft_attached.line_valid) {
-		pcb_render->set_color(pcb_crosshair.GC, &CURRENT->meta.real.color);
+		pcb_render->set_color(pcb_crosshair.GC, &PCB_CURRLAYER(PCB)->meta.real.color);
 		pcb_draw_wireframe_line(pcb_crosshair.GC,
 			pcb_ddraft_attached.line.Point1.X, pcb_ddraft_attached.line.Point1.Y, pcb_ddraft_attached.line.Point2.X, pcb_ddraft_attached.line.Point2.Y,
 			conf_core.design.line_thickness, 0);