From 486020b4032da9bbb20fafd83ec6f10263c892e5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 19 Dec 2006 02:41:19 +0000 Subject: save keybindings to file used at startup; allow keybindings file to be cmdline-specified; remove some GTK2FIX comments; fix feedback based on john anderson's patch; apply scons patches; fix crash when taking MIDI ports online+offline; try to prevent aborts when shutting down due to metering thread; start work on reconstructing GlobalFOOCommand commands; use ftruncate to hint at peakfile preallocation to reduce fragmentation git-svn-id: svn://localhost/ardour2/trunk@1223 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/main.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour/main.cc') diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 21b03f9a63..3e0d6d4e62 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -417,6 +417,9 @@ int main (int argc, char *argv[]) exit (1); } + if (!keybindings_path.empty()) { + ui->set_keybindings_path (keybindings_path); + } if (!no_splash) { ui->show_splash (); @@ -445,7 +448,7 @@ int main (int argc, char *argv[]) } ui->start_engine (); - + if (maybe_load_session ()) { ui->run (text_receiver); ui = 0; -- cgit v1.2.3