Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 12183)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 12185)
@@ -1241,10 +1241,9 @@
                 if (drawArrowHelper != null) {
                     boolean drawArrow;
-                    if (showHeadArrowOnly) {
-                        // always draw last arrow - no matter how short the segment is
-                        drawArrow = !it.hasNext();
-                    } else {
+                    // always draw last arrow - no matter how short the segment is
+                    drawArrow = !it.hasNext();
+                    if (!showHeadArrowOnly) {
                         // draw arrows in between only if there is enough space
-                        drawArrow = p1.distanceToInView(p2) > drawArrowHelper.getOnLineLength() * 1.3;
+                        drawArrow = drawArrow || p1.distanceToInView(p2) > drawArrowHelper.getOnLineLength() * 1.3;
                     }
                     if (drawArrow) {