1 files changed, 14 insertions, 0 deletions
diff --git a/src/ccapi/lib/ccapi_context.c b/src/ccapi/lib/ccapi_context.c
index 3b8d60e3eb..640e153e8c 100644
--- a/src/ccapi/lib/ccapi_context.c
+++ b/src/ccapi/lib/ccapi_context.c
@@ -80,6 +80,7 @@ static cc_int32 cci_context_sync (cci_context_t in_context,
 #endif
 
 MAKE_INIT_FUNCTION(cci_thread_init);
+MAKE_FINI_FUNCTION(cci_thread_fini);
 
 /* ------------------------------------------------------------------------ */
 
@@ -98,6 +99,19 @@ static int cci_thread_init (void)
     return err;
 }
 
+/* ------------------------------------------------------------------------ */
+
+static void cci_thread_fini (void)
+{
+    if (!INITIALIZER_RAN (cci_thread_init) || PROGRAM_EXITING ()) {
+	return;
+    }
+    
+    cci_context_change_time_thread_fini ();
+    cci_ipc_thread_fini ();
+}
+
+
 #ifdef TARGET_OS_MAC
 #pragma mark -
 #endif