Reference glabels.org website

[glabels] / src / object-editor-shadow-page.c

diff --git a/src/object-editor-shadow-page.c b/src/object-editor-shadow-page.c
index d10a1590db4231e49e769df075d65d02b82b881f..e89ecf7c77f5586e1cb3cb068e1ce49c513da2bd 100644 (file)
--- a/src/object-editor-shadow-page.c
+++ b/src/object-editor-shadow-page.c
@@ -228,7 +228,7 @@ gl_object_editor_set_shadow_color (glObjectEditor      *editor,
 
        }
        
-       if (!color_node->field_flag) {
+       if (!color_node->field_flag || !merge_flag) {
                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
                                                  (editor->priv->shadow_color_radio), TRUE); 
                gtk_widget_set_sensitive (editor->priv->shadow_color_combo, TRUE);