diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-18 19:17:16 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-11-18 19:17:16 +0000 |
| commit | 85dedba0450c986171ac85a562995ca4213fc84f (patch) | |
| tree | ab8b316b63550f5ee4793423584a13311214be5a /gtk2_ardour | |
| parent | 9b373cd25748ebc2f066357ccd75ccd3bfad1d3d (diff) | |
don't show nag screen if export was stopped or if SAE (for now)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4212 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/export_dialog.cc | 15 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 0518395965..b0aa6b17d6 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -1010,11 +1010,18 @@ ExportDialog::do_export () progress_connection.disconnect (); end_dialog (); - NagScreen* ns = NagScreen::maybe_nag (_("export")); + /* if not stopped early and not SAE, ask for money, maybe */ - if (ns) { - ns->nag (); - delete ns; + cerr << "At end, spec.stop == " << spec.stop << endl; + + if (!spec.stop && !Profile->get_sae()) { + + NagScreen* ns = NagScreen::maybe_nag (_("export")); + + if (ns) { + ns->nag (); + delete ns; + } } } diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 1c1589695a..d9738e9dc0 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -228,7 +228,6 @@ fixup_bundle_environment () path += "/../Resources/gdk-pixbuf.loaders"; setenv ("GDK_PIXBUF_MODULE_FILE", path.c_str(), 1); - cerr << "Set GDK_PIXBUF_MODULE_FILE to " << path << endl; if (getenv ("ARDOUR_WITH_JACK")) { // JACK driver dir |