always set color, don't assume color was left at default color

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 903ced29da67d62cad7979ff57f02dfb98087eac..c9d92f49ad9d5f72c9ac75c73c7ed75df1487b4b 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -831,6 +831,7 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
                        gvrender_set_pencolor(job, color);
                        gvrender_set_fillcolor(job, color);
                    } else {
+                       gvrender_set_pencolor(job, DEFAULT_COLOR);
                        gvrender_set_fillcolor(job, DEFAULT_COLOR);
                    }
                }
@@ -865,6 +866,7 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
                    gvrender_set_pencolor(job, color);
                    gvrender_set_fillcolor(job, color);
                } else {
+                   gvrender_set_pencolor(job, DEFAULT_COLOR);
                    gvrender_set_fillcolor(job, DEFAULT_COLOR);
                }
            }
@@ -893,10 +895,6 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
            }
        }
     }
-    if (ED_active(e)) {
-       gvrender_set_pencolor(job, DEFAULT_COLOR);
-       gvrender_set_fillcolor(job, DEFAULT_COLOR);
-    }
     xdemitState = EMIT_LABEL;
     if (ED_label(e)) {
        emit_label(job, ED_label(e), (void *) e);

diff --git a/lib/common/shapes.c b/lib/common/shapes.c
index a25ce7b918deaed1a79ce88367fd65ceb8121cd7..2e36aee2655182bdd6677cd9219f662895a8500b 100644 (file)
--- a/lib/common/shapes.c
+++ b/lib/common/shapes.c
@@ -250,6 +250,8 @@ void pencolor(GVJ_t * job, node_t * n)
     color = late_nnstring(n, N_color, "");
     if (color[0])
        gvrender_set_pencolor(job, color);
+    else
+       gvrender_set_pencolor(job, DEFAULT_COLOR);
 }
 
 static