diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index 0abf0181d3..7d6c2621de 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in @@ -566,42 +566,42 @@ style "menu_bar_base" = "default_base" */ style "fatal_message" = "medium_text" { - fg[ACTIVE] = { 1.0, 0, 1.0 } - fg[NORMAL] = { 0.80, 0.80, 0.80 } - bg[ACTIVE] = { 0,0,0 } - bg[NORMAL] = { 0,0,0 } - base[ACTIVE] = { 0,0,0 } - base[NORMAL] = { 0,0,0 } + fg[ACTIVE] = { 1.0, 0.20, 0.20 } + fg[NORMAL] = { 1.0, 0.20, 0.20 } + bg[ACTIVE] = "#1a1e24" + bg[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" } style "error_message" = "medium_text" { - fg[ACTIVE] = { 1.0, 0, 0 } - fg[NORMAL] = { 0.80, 0.80, 0.80 } - bg[ACTIVE] = { 0,0,0 } - bg[NORMAL] = { 0,0,0 } - base[ACTIVE] = { 0,0,0 } - base[NORMAL] = { 0,0,0 } + fg[ACTIVE] = { 1.0, 0.20, 0.20 } + fg[NORMAL] = { 1.0, 0.20, 0.20 } + bg[ACTIVE] = "#1a1e24" + bg[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" } style "info_message" = "medium_text" { - fg[ACTIVE] = { 1.0, 0, 0 } - fg[NORMAL] = { 0.80, 0.80, 0.80 } - bg[ACTIVE] = { 0,0,0 } - bg[NORMAL] = { 0,0,0 } - base[ACTIVE] = { 0,0,0 } - base[NORMAL] = { 0,0,0 } + fg[ACTIVE] = { 0.20, 0.80, 0.20 } + fg[NORMAL] = { 0.20, 0.80, 0.20 } + bg[ACTIVE] = "#1a1e24" + bg[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" } style "warning_message" = "medium_text" { - fg[ACTIVE] = { 0.30,0.30, 1.0 } - fg[NORMAL] = { 0.80, 0.80, 0.80 } - bg[ACTIVE] = { 0, 0, 0 } - bg[NORMAL] = { 0, 0, 0 } - base[ACTIVE] = { 0, 0, 0 } - base[NORMAL] = { 0, 0, 0 } + fg[ACTIVE] = { 0.80, 0.80, 0.20 } + fg[NORMAL] = { 0.80, 0.80, 0.20 } + bg[ACTIVE] = "#1a1e24" + bg[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" + base[NORMAL] = "#1a1e24" } style "medium_entry" = "medium_text" diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index d7abce0022..0a019408ac 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -252,7 +252,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) /* lets get this party started */ - try { + try { if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) { throw failed_constructor (); } diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 1620226ccc..35a6036245 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -119,6 +119,15 @@ UI::caller_is_ui_thread () int UI::load_rcfile (string path, bool themechange) { + /* Yes, pointers to Glib::RefPtr. If these are not kept around, + * a segfault somewhere deep in the wonderfully robust glib will result. + * This does not occur if wiget.get_style is used instead of rc.get_style below, + * except that doesn't actually work... */ + static Glib::RefPtr