Index: trunk/src/thermal.c
===================================================================
--- trunk/src/thermal.c	(revision 19535)
+++ trunk/src/thermal.c	(revision 19536)
@@ -723,7 +723,7 @@
 	else
 		thr = 0;
 
-	shp = pcb_pstk_shape_at(pcb, ps, layer);
+	shp = pcb_pstk_shape_at_(pcb, ps, layer, 1);
 	if (shp == NULL)
 		return NULL;
 
@@ -738,7 +738,9 @@
 
 	switch(thr & 3) {
 		case PCB_THERMAL_NOSHAPE:
-			goto hshadow; /* local version of the padstack-central hshadow setting */
+			tmpshp.shape = PCB_PSSH_HSHADOW;
+			tmpshp.clearance = shp->clearance;
+			return pcb_thermal_area_pstk_nothermal(pcb, ps, lid, &tmpshp, clearance);
 		case PCB_THERMAL_SOLID: return NULL;
 		case PCB_THERMAL_ROUND:
 		case PCB_THERMAL_SHARP: