diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-05-09 10:34:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-05-09 10:34:00 +0000 |
| commit | c8f6f87ea79eae60bbed6ed68e08db5973019b95 (patch) | |
| tree | 4872ec1372c1adec384763c24da8192e4023e3c7 | |
| parent | f0154820885f8792fef65dede9b707e2eac6fa53 (diff) | |
Fix critical glib warning if a BaseUI is quit without
being started.
git-svn-id: svn://localhost/ardour2/branches/3.0@12219 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rwxr-xr-x | gtk2_ardour/ardev | 2 | ||||
| -rw-r--r-- | libs/pbd/base_ui.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev index aee9a48102..cbe16ac5a0 100755 --- a/gtk2_ardour/ardev +++ b/gtk2_ardour/ardev @@ -1,4 +1,6 @@ #!/bin/sh . `dirname "$0"`/../build/gtk2_ardour/ardev_common_waf.sh LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH +ldd $TOP/$EXECUTABLE | grep boost +ldd $TOP/build/libs/ardour/libardour.so | grep boost exec $TOP/$EXECUTABLE "$@" diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc index 6c21549e8b..31f956f4cf 100644 --- a/libs/pbd/base_ui.cc +++ b/libs/pbd/base_ui.cc @@ -97,7 +97,7 @@ BaseUI::run () void BaseUI::quit () { - if (_main_loop->is_running()) { + if (_main_loop && _main_loop->is_running()) { _main_loop->quit (); run_loop_thread->join (); } |