summaryrefslogtreecommitdiff
path: root/gtk2_ardour/startup.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-10-19 18:12:20 +0000
committerCarl Hetherington <carl@carlh.net>2009-10-19 18:12:20 +0000
commit41b8a010da914eace2e300ef0a3c0800ff6183e1 (patch)
treebbd8d1b47b0ce2c53ddcca0eb4a607da250f4f45 /gtk2_ardour/startup.cc
parent917f02e5f62a5603d0314b33bcdc0825a7888606 (diff)
Stop ardour exiting in the case where you have a loaded session, then select New Session, cancel.
git-svn-id: svn://localhost/ardour2/branches/3.0@5808 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/startup.cc')
-rw-r--r--gtk2_ardour/startup.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 4fc372b976..962046165b 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -38,7 +38,7 @@ static string poor_mans_glob (string path)
ArdourStartup::ArdourStartup ()
- : applying (false)
+ : _applying (false)
, ic_new_session_button (_("Open a new session"))
, ic_existing_session_button (_("Open an existing session"))
, monitor_via_hardware_button (_("Use an external mixer or the hardware mixer of your audio interface.\n\
@@ -418,21 +418,19 @@ ArdourStartup::setup_final_page ()
void
ArdourStartup::on_cancel ()
{
- exit (1);
+ gtk_main_quit ();
}
void
ArdourStartup::on_close ()
{
- if (!applying) {
- exit (1);
- }
+ gtk_main_quit ();
}
void
ArdourStartup::on_apply ()
{
- applying = true;
+ _applying = true;
// XXX do stuff and then ....