Merge branch 'master' of git://git.0pointer.de/pulseaudio

1 files changed, 6 insertions, 4 deletions

diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
index b2638b10..aa8de8df 100644
--- a/src/pulsecore/core.c
+++ b/src/pulsecore/core.c
@@ -39,7 +39,7 @@
 #include <pulsecore/core-scache.h>
 #include <pulsecore/autoload.h>
 #include <pulsecore/core-subscribe.h>
-#include <pulsecore/props.h>
+#include <pulsecore/shared.h>
 #include <pulsecore/random.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
@@ -141,7 +141,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     for (j = 0; j < PA_CORE_HOOK_MAX; j++)
         pa_hook_init(&c->hooks[j], c);
 
-    pa_property_init(c);
+    pa_shared_init(c);
 
     pa_random(&c->cookie, sizeof(c->cookie));
 
@@ -149,6 +149,8 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
     pa_check_signal_is_blocked(SIGPIPE);
 #endif
 
+    pa_core_check_quit(c);
+
     return c;
 }
 
@@ -189,10 +191,10 @@ static void core_free(pa_object *o) {
     pa_silence_cache_done(&c->silence_cache);
     pa_mempool_free(c->mempool);
 
-    pa_property_cleanup(c);
+    pa_shared_cleanup(c);
 
     for (j = 0; j < PA_CORE_HOOK_MAX; j++)
-        pa_hook_free(&c->hooks[j]);
+        pa_hook_done(&c->hooks[j]);
 
     pa_xfree(c);
 }