diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-03 18:08:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-03 18:08:11 +0000 |
| commit | ca81401b14782b5d13905732778e6bf9b5f5f2ae (patch) | |
| tree | bf4c346b8cdb8bbdf86e8ba0f0efc80c87d4adc3 /gtk2_ardour/main.cc | |
| parent | b5f497c0c98501cf6a9deff7593e286613b7dc0c (diff) | |
massive changes to clean up what happens during session destruction when an exception is thrown
git-svn-id: svn://localhost/ardour2/trunk@1261 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/main.cc')
| -rw-r--r-- | gtk2_ardour/main.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 3e0d6d4e62..1004de19c2 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -79,8 +79,6 @@ shutdown (int status) } else { if (ui) { - msg = _("stopping user interface\n"); - write (1, msg, strlen (msg)); ui->kill(); } @@ -301,7 +299,7 @@ maybe_load_session () if (!session_name.length()) { ui->hide_splash (); if (!Config->get_no_new_session_dialog()) { - ui->new_session (true); + ui->new_session (); } return true; @@ -326,7 +324,10 @@ To create it from the command line, start ardour as \"ardour --new %1"), path) < return false; } - ui->load_session (path, name); + if (ui->load_session (path, name)) { + /* it failed */ + return false; + } } else { @@ -338,7 +339,7 @@ To create it from the command line, start ardour as \"ardour --new %1"), path) < /* Show the NSD */ ui->hide_splash (); if (!Config->get_no_new_session_dialog()) { - ui->new_session (true); + ui->new_session (); } } |