[pulseaudio-commits] r2165 - /branches/prepare-0.9.10/src/daemon/main.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Mar 28 00:33:18 2008
New Revision: 2165

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2165&root=pulseaudio&view=rev
Log:
merge r2111 from trunk

Modified:
    branches/prepare-0.9.10/src/daemon/main.c

Modified: branches/prepare-0.9.10/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/daemon/main.c?rev=2165&root=pulseaudio&r1=2164&r2=2165&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/daemon/main.c (original)
+++ branches/prepare-0.9.10/src/daemon/main.c Fri Mar 28 00:33:18 2008
@@ -333,6 +333,7 @@
     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 @@
 
     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 @@
     WSACleanup();
 #endif
 
-    pa_ltdl_done();
+    if (ltdl_init)
+        pa_ltdl_done();
 
 #ifdef HAVE_DBUS
     dbus_shutdown();