continue tweaks on the color road

[ardour.git] / gtk2_ardour / utils.cc

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 0f61656033dd05bd593e86e7628e74b86328a053..e353d609cc1dbd3f9efb84c51dfda0b9f5ebd45f 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -296,7 +296,6 @@ ARDOUR_UI_UTILS::rgba_from_style (string style, uint32_t r, uint32_t g, uint32_t
                                a = rc->fg[GTK_STATE_ACTIVE].red / 257;
                        }
                } else if (attr == "bg") {
-                       r = g = b = 0;
                        r = rc->bg[state].red / 257;
                        g = rc->bg[state].green / 257;
                        b = rc->bg[state].blue / 257;
@@ -694,6 +693,9 @@ ARDOUR_UI_UTILS::get_icon_path (const char* cname, string icon_set, bool is_imag
                spath.add_subdirectory_to_paths ("icons");
                spath.add_subdirectory_to_paths (icon_set);
                
+               find_file (spath, name, data_file_path);
+       } else {
+               spath.add_subdirectory_to_paths ("icons");
                find_file (spath, name, data_file_path);
        }