Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 21100)
+++ trunk/src/draw.c	(revision 21101)
@@ -63,7 +63,7 @@
 
 pcb_box_t pcb_draw_invalidated = { COORD_MAX, COORD_MAX, -COORD_MAX, -COORD_MAX };
 
-int pcb_draw_doing_pinout = 0;
+int pcb_draw_force_termlab = 0;
 pcb_bool pcb_draw_doing_assy = pcb_false;
 static vtp0_t delayed_labels, delayed_objs;
 pcb_bool delayed_labels_enabled = pcb_false;
@@ -877,7 +877,7 @@
 		return;
 
 	/* do not show layer-object labels of the other side on non-pinout views */
-	if ((!pcb_draw_doing_pinout) && (obj->parent_type == PCB_PARENT_LAYER)) {
+	if ((!pcb_draw_force_termlab) && (obj->parent_type == PCB_PARENT_LAYER)) {
 		pcb_layer_t *ly = pcb_layer_get_real(obj->parent.layer);
 		if ((ly != NULL) && (ly->meta.real.grp != gid))
 			return;
@@ -1080,10 +1080,10 @@
 	pcb_gui->set_color(pcb_draw_out.fgGC, conf_core.appearance.color.pin_name);
 
 	if (pcb_gui->gui)
-		pcb_draw_doing_pinout++;
+		pcb_draw_force_termlab++;
 	pcb_text_draw_string(info, font, label, x, y, scale, direction*90.0, mirror, 1, 0, 0, 0, 0, PCB_TXT_TINY_HIDE);
 	if (pcb_gui->gui)
-		pcb_draw_doing_pinout--;
+		pcb_draw_force_termlab--;
 }
 
 void pcb_term_label_invalidate(pcb_coord_t x, pcb_coord_t y, double scale, pcb_bool vert, pcb_bool centered, const char *lab, int intconn)
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 21100)
+++ trunk/src/draw.h	(revision 21101)
@@ -105,7 +105,7 @@
 	pcb_draw_invalidated.Y2 = MAX(pcb_draw_invalidated.Y2, box->Y2); \
 } while(0)
 
-extern int pcb_draw_doing_pinout;
+extern int pcb_draw_force_termlab; /* force drawing terminal lables - useful for pinout previews */
 extern pcb_bool pcb_draw_doing_assy;
 
 void pcb_lighten_color(const char *orig, char buf[8], double factor);
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 21100)
+++ trunk/src/obj_arc.c	(revision 21101)
@@ -960,7 +960,7 @@
 			pcb_draw_wireframe_arc(pcb_draw_out.fgGC, arc, thickness);
 	}
 	if (arc->term != NULL) {
-		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, arc))
+		if ((pcb_draw_force_termlab) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, arc))
 			pcb_draw_delay_label_add((pcb_any_obj_t *)arc);
 	}
 }
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 21100)
+++ trunk/src/obj_line.c	(revision 21101)
@@ -1103,7 +1103,7 @@
 	}
 
 	if (line->term != NULL) {
-		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, line))
+		if ((pcb_draw_force_termlab) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, line))
 			pcb_draw_delay_label_add((pcb_any_obj_t *)line);
 	}
 }
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 21100)
+++ trunk/src/obj_poly.c	(revision 21101)
@@ -1192,7 +1192,7 @@
 	}
 
 	if (polygon->term != NULL) {
-		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, polygon))
+		if ((pcb_draw_force_termlab) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, polygon))
 			pcb_draw_delay_label_add((pcb_any_obj_t *)polygon);
 	}
 
Index: trunk/src/obj_pstk.c
===================================================================
--- trunk/src/obj_pstk.c	(revision 21100)
+++ trunk/src/obj_pstk.c	(revision 21101)
@@ -342,7 +342,7 @@
 
 	if (ps->term == NULL) {
 		/* normal via, not a terminal */
-		if (!pcb_draw_doing_pinout && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, ps)) {
+		if (!pcb_draw_force_termlab && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, ps)) {
 			if (PCB_FLAG_TEST(PCB_FLAG_WARN, ps))
 				color = conf_core.appearance.color.warn;
 			else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps))
@@ -367,7 +367,7 @@
 	}
 	else {
 		/* terminal */
-		if (!pcb_draw_doing_pinout && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, ps)) {
+		if (!pcb_draw_force_termlab && PCB_FLAG_TEST(PCB_FLAG_WARN | PCB_FLAG_SELECTED | PCB_FLAG_FOUND, ps)) {
 			if (PCB_FLAG_TEST(PCB_FLAG_WARN, ps))
 				color = conf_core.appearance.color.warn;
 			else if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps))
@@ -597,7 +597,7 @@
 
 	/* draw the label if enabled, after everything else is drawn */
 	if (ps->term != NULL) {
-		if ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, ps))
+		if ((pcb_draw_force_termlab) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, ps))
 			pcb_pstk_draw_label(info, ps);
 	}
 	return PCB_R_DIR_FOUND_CONTINUE;
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 21100)
+++ trunk/src/obj_text.c	(revision 21101)
@@ -1210,7 +1210,7 @@
 	DrawTextLowLevel_(info, text, min_line_width, 0, 0, 0, tiny);
 
 	if (text->term != NULL) {
-		if ((allow_term_gfx) && ((pcb_draw_doing_pinout) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, text)))
+		if ((allow_term_gfx) && ((pcb_draw_force_termlab) || PCB_FLAG_TEST(PCB_FLAG_TERMNAME, text)))
 			pcb_draw_delay_label_add((pcb_any_obj_t *)text);
 	}
 }
Index: trunk/src_plugins/dialogs/dlg_pinout.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pinout.c	(revision 21100)
+++ trunk/src_plugins/dialogs/dlg_pinout.c	(revision 21101)
@@ -62,10 +62,10 @@
 	pcb_objtype_t type = pcb_search_obj_by_id_(ctx->data, &r1, &r2, &r3, ctx->subc_id, PCB_OBJ_SUBC);
 	if (type == PCB_OBJ_SUBC) {
 		pcb_subc_t *sc = r2;
-		int orig_po = pcb_draw_doing_pinout;
-		pcb_draw_doing_pinout = pcb_true;
+		int orig_po = pcb_draw_force_termlab;
+		pcb_draw_force_termlab = pcb_true;
 		pcb_subc_draw_preview(sc, &e->view);
-		pcb_draw_doing_pinout = orig_po;
+		pcb_draw_force_termlab = orig_po;
 	}
 	else {
 		char tmp[128];
Index: trunk/src_plugins/lib_gtk_common/dlg_library.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_library.c	(revision 21100)
+++ trunk/src_plugins/lib_gtk_common/dlg_library.c	(revision 21101)
@@ -796,10 +796,10 @@
 	pcb_subc_t *sc = e->content.draw_data;
 
 	if (sc != NULL) {
-		int orig_po = pcb_draw_doing_pinout;
-		pcb_draw_doing_pinout = pcb_true;
+		int orig_po = pcb_draw_force_termlab;
+		pcb_draw_force_termlab = pcb_true;
  		pcb_subc_draw_preview(sc, &e->view);
-		pcb_draw_doing_pinout = orig_po;
+		pcb_draw_force_termlab = orig_po;
 	}
 }