Fix crash when X11 is not available for VST UIs

[ardour.git] / gtk2_ardour / sys_ex.cc

diff --git a/gtk2_ardour/sys_ex.cc b/gtk2_ardour/sys_ex.cc
index 2097de4fa91f42733e0a307ae2365acf0c2bd866..2363b7be0af2162038c66d6b86768ca79bb48419 100644 (file)
--- a/gtk2_ardour/sys_ex.cc
+++ b/gtk2_ardour/sys_ex.cc
@@ -1,51 +1,55 @@
 /*
-    Copyright (C) 2009 Paul Davis
-    Author: Hans Baier
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * Copyright (C) 2013-2017 Paul Davis <paul@linuxaudiosystems.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #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,
-       string&         text,
-       double          height,
-       double          x,
-       double          y)
-       : _region (region)
+       MidiRegionView&             region,
+       ArdourCanvas::Container*    parent,
+       string&                     text,
+       double                      height,
+       double                      x,
+       double                      y,
+       ARDOUR::MidiModel::SysExPtr sysex)
+       : _sysex (sysex)
 {
        _flag = new ArdourCanvas::Flag (
                parent,
-               height, 
-               ARDOUR_UI::config()->get_canvasvar_MidiSysExOutline(),
-               ARDOUR_UI::config()->get_canvasvar_MidiSysExFill(),
+               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()
 {
+       /* do not delete flag because it was added to a parent/container which
+          will delete it.
+       */
+       _flag = 0;
 }
 
 bool