Fix potential crash at exit/close.

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index b13e2517c3eebe5d0d56f11f957e78033ce46d00..bb769e30ef9251ffd309921374f688b31b178184 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -112,7 +112,6 @@
 #include "gui_object.h"
 #include "gui_thread.h"
 #include "keyboard.h"
-#include "keyeditor.h"
 #include "luainstance.h"
 #include "marker.h"
 #include "midi_region_view.h"
@@ -393,6 +392,7 @@ Editor::Editor ()
        , _all_region_actions_sensitized (false)
        , _ignore_region_action (false)
        , _last_region_menu_was_main (false)
+       , _track_selection_change_without_scroll (false)
        , cd_marker_bar_drag_rect (0)
        , range_bar_drag_rect (0)
        , transport_bar_drag_rect (0)
@@ -868,9 +868,6 @@ Editor::Editor ()
 
        setup_fade_images ();
 
-       LuaInstance::instance(); // instantiate
-       LuaInstance::instance()->ActionChanged.connect (sigc::mem_fun (*this, &Editor::set_script_action_name));
-
        instant_save ();
 }
 
@@ -1698,7 +1695,7 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type,
        /* When the region menu is opened, we setup the actions so that they look right
           in the menu.
        */
-       sensitize_the_right_region_actions (true, false);
+       sensitize_the_right_region_actions (false);
        _last_region_menu_was_main = false;
 
        menu->signal_hide().connect (sigc::bind (sigc::mem_fun (*this, &Editor::sensitize_all_region_actions), true));
@@ -2346,6 +2343,7 @@ Editor::set_edit_point_preference (EditPoint ep, bool force)
        }
 
        reset_canvas_action_sensitivity (in_track_canvas);
+       sensitize_the_right_region_actions (false);
 
        instant_save ();
 }
@@ -5875,24 +5873,6 @@ Editor::trigger_script (int i)
        LuaInstance::instance()-> call_action (i);
 }
 
-void
-Editor::set_script_action_name (int i, const std::string& n)
-{
-       string const a = string_compose (X_("script-action-%1"), i + 1);
-       Glib::RefPtr<Action> act = ActionManager::get_action(X_("Editor"), a.c_str());
-       assert (act);
-       if (n.empty ()) {
-               act->set_label (string_compose (_("Unset #%1"), i + 1));
-               act->set_tooltip (_("no action bound"));
-               act->set_sensitive (false);
-       } else {
-               act->set_label (n);
-               act->set_tooltip (n);
-               act->set_sensitive (true);
-       }
-       KeyEditor::UpdateBindings ();
-}
-
 void
 Editor::show_editor_list (bool yn)
 {