From 82031d05e0f2f4500535a6e35cdc5199b0b2d3a0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 19 Jun 2008 15:26:14 +0000 Subject: [PATCH] reset editor's entered_track to null if that track is deleted; fix use of wrong constructor for MessageDialog in both IOSelector and import handling, which would lead to a glibmm exception caused by a null C string (old, common and very very bad) git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3483 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_audio_import.cc | 4 ++-- gtk2_ardour/editor_route_list.cc | 4 ++++ gtk2_ardour/io_selector.cc | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 35d5dcd2ca..3d75de782c 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -70,7 +70,7 @@ void Editor::add_external_audio_action (ImportMode mode_hint) { if (session == 0) { - MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded.")); + MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded.")); msg.run (); return; } @@ -91,7 +91,7 @@ Editor::external_audio_dialog () uint32_t track_cnt; if (session == 0) { - MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded.")); + MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded.")); msg.run (); return; } diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc index 628df503d9..24fbe5df31 100644 --- a/gtk2_ardour/editor_route_list.cc +++ b/gtk2_ardour/editor_route_list.cc @@ -125,6 +125,10 @@ Editor::remove_route (TimeAxisView *tv) TreeModel::Children rows = route_display_model->children(); TreeModel::Children::iterator ri; + if (tv == entered_track) { + entered_track = 0; + } + /* Decrement old order keys for tracks `above' the one that is being removed */ for (ri = rows.begin(); ri != rows.end(); ++ri) { TimeAxisView* v = (*ri)[route_display_columns.tv]; diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index f25bd9be00..0f877206f7 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -547,7 +547,7 @@ IOSelector::add_port () } catch (AudioEngine::PortRegistrationFailure& err) { - MessageDialog msg (0, _("There are no more JACK ports available.")); + MessageDialog msg (_("There are no more JACK ports available.")); msg.run (); } @@ -558,7 +558,7 @@ IOSelector::add_port () } catch (AudioEngine::PortRegistrationFailure& err) { - MessageDialog msg (0, _("There are no more JACK ports available.")); + MessageDialog msg (_("There are no more JACK ports available.")); msg.run (); } }