Index: png.c
===================================================================
--- png.c	(revision 27167)
+++ png.c	(revision 27168)
@@ -796,8 +796,6 @@
 
 static int png_set_layer_group(pcb_hid_t *hid, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
 {
-	doing_outline = 0;
-
 	if (flags & PCB_LYT_UI)
 		return 0;
 
@@ -828,11 +826,6 @@
 	if (photo_mode)
 		return png_set_layer_group_photo(group, purpose, purpi, layer, flags, is_empty, xform);
 
-	if (PCB_LAYER_IS_OUTLINE(flags, purpi)) {
-		doing_outline = 1;
-		have_outline = 0;
-	}
-
 	if (as_shown) {
 		if ((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) {
 			if (PCB_LAYERFLG_ON_VISIBLE_SIDE(flags))
Index: png_photo2.c
===================================================================
--- png_photo2.c	(revision 27167)
+++ png_photo2.c	(revision 27168)
@@ -130,6 +130,13 @@
 		return 1;
 	photo_last_grp = group;
 
+	if (PCB_LAYER_IS_OUTLINE(flags, purpi)) {
+		doing_outline = 1;
+		have_outline = 0;
+	}
+	else
+		doing_outline = 0;
+
 	is_photo_drill = (PCB_LAYER_IS_DRILL(flags, purpi) || ((flags & PCB_LYT_MECH) && PCB_LAYER_IS_ROUTE(flags, purpi)));
 		if (((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) && (flags & PCB_LYT_TOP)) {
 			if (photo_flip)