Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / sys_ex.cc

diff --git a/gtk2_ardour/sys_ex.cc b/gtk2_ardour/sys_ex.cc
index 94ee5302e3b0d7775b30f3ed58ba29907b6de5ad..f3e02b1253f7e8081ebe37783326189b3ddbe1ee 100644 (file)
--- a/gtk2_ardour/sys_ex.cc
+++ b/gtk2_ardour/sys_ex.cc
@@ -19,33 +19,34 @@
 
 #include <iostream>
 #include "canvas/flag.h"
-#include "ardour_ui.h"
 #include "sys_ex.h"
+#include "ui_config.h"
 
 using namespace std;
 
 SysEx::SysEx (
        MidiRegionView& region,
-       ArdourCanvas::Group* parent,
+       ArdourCanvas::Container* parent,
        string&         text,
        double          height,
        double          x,
        double          y)
-       : _region (region)
 {
        _flag = new ArdourCanvas::Flag (
                parent,
-               height, 
-               ARDOUR_UI::config()->canvasvar_MidiSysExOutline.get(),
-               ARDOUR_UI::config()->canvasvar_MidiSysExFill.get(),
+               height,
+               UIConfiguration::instance().color ("midi sysex outline"),
+               UIConfiguration::instance().color_mod ("midi sysex fill", "midi sysex fill"),
                ArdourCanvas::Duple (x, y)
                );
-       
+
        _flag->set_text (text);
 }
 
 SysEx::~SysEx()
 {
+       delete _flag;
+       _flag = 0;
 }
 
 bool