diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index abb781bf68..1c709c4956 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -997,6 +997,7 @@ ARDOUR_UI::idle_finish () void ARDOUR_UI::finish() { + cout<<"ARDOUR_UI::finish()"<actively_recording () && _session->have_rec_enabled_track () ) { @@ -4882,6 +4883,4 @@ void ARDOUR_UI::hide_application () { Application::instance ()-> hide (); -} - - +} \ No newline at end of file diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 749604a304..bcc9f562c5 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -665,7 +665,7 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0)); - act = ActionManager::register_action (common_actions, X_("Quit"), _("Quit_custom"), (hide_return (sigc::mem_fun(*this, &ARDOUR_UI::finish)))); + act = ActionManager::register_action (common_actions, X_("Quit"), _("Quit"), (hide_return (sigc::mem_fun(*this, &ARDOUR_UI::finish)))); act = ActionManager::register_action (common_actions, X_("Hide"), _("Hide"), sigc::mem_fun (*this, &ARDOUR_UI::hide_application)); diff --git a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Info.plist b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Info.plist index 7d4f93b6ea..0b0c9791bf 100644 --- a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Info.plist +++ b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Info.plist @@ -40,7 +40,7 @@ positionOfDivider 333 savedFrame - 1318 437 602 597 0 0 1920 1178 + 929 441 740 597 0 0 1920 1178 selectedTabView result diff --git a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/Scripts/main.scpt b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/Scripts/main.scpt index bb858548b0..df0980388d 100644 Binary files a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/Scripts/main.scpt and b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/Scripts/main.scpt differ diff --git a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/applet.rsrc b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/applet.rsrc index 9bf46e4523..cca96bf817 100644 Binary files a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/applet.rsrc and b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.app/Contents/Resources/applet.rsrc differ diff --git a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.scpt b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.scpt index 8f05617d91..6a051aa2c8 100644 Binary files a/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.scpt and b/tools/osx_packaging/TracksLiveInstall/Tracks Preferences CleanUp.scpt differ