x-fade uses cairo-generated icons, remove XPM

[ardour.git] / gtk2_ardour / editor_mouse.cc

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 5fc952481046e382743c3c20cc3dc8d8ea3d1cdd..2798ba4a3c7b0063f641788d6ead19231726e5e6 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -237,8 +237,8 @@ Editor::snap_mode_button_clicked (GdkEventButton* ev)
 
 
 
-static Glib::RefPtr<Action>
-get_mouse_mode_action(MouseMode m)
+Glib::RefPtr<Action>
+Editor::get_mouse_mode_action(MouseMode m) const
 {
        switch (m) {
        case MouseRange:
@@ -2562,7 +2562,7 @@ Editor::escape ()
 {
        if (_drags->active ()) {
                _drags->abort ();
-       } else {
+       } else if (_session) {
                selection->clear ();
 
                /* if session is playing a range, cancel that */