diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:33:18 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:33:18 +0000 |
| commit | 1eb7239764ff1c2cd1d6ec7269f620a6c3f8cbc9 (patch) | |
| tree | f5eb0f5a579e788bb8477f251e2ec4af0d035471 | |
| parent | 5045d26c48197de11e15b60f1e67771c3644995d (diff) | |
merge r2111 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2165 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/daemon/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index acc2f028..7823180a 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -333,6 +333,7 @@ int main(int argc, char *argv[]) { int valid_pid_file = 0; gid_t gid = (gid_t) -1; pa_bool_t allow_realtime, allow_high_priority; + pa_bool_t ltdl_init = FALSE; #ifdef OS_IS_WIN32 pa_time_event *timer; @@ -504,6 +505,7 @@ int main(int argc, char *argv[]) { LTDL_SET_PRELOADED_SYMBOLS(); pa_ltdl_init(); + ltdl_init = TRUE; if (conf->dl_search_path) lt_dlsetsearchpath(conf->dl_search_path); @@ -837,7 +839,8 @@ finish: WSACleanup(); #endif - pa_ltdl_done(); + if (ltdl_init) + pa_ltdl_done(); #ifdef HAVE_DBUS dbus_shutdown(); |