smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-27 08:57:41 +01:00
Code Issues Projects Releases Wiki Activity

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)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3483 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-06-19 15:26:14 +00:00
parent 00c57fc390
commit 82031d05e0
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor_audio_import.cc
View file

@ -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;
}

4
gtk2_ardour/editor_route_list.cc
View file

@ -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];

4
gtk2_ardour/io_selector.cc
View file

@ -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 ();
}
}