Attach and join the IPC helper

[vlc] / src / misc / win32_specific.c

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 9e27ca9a18322178178f4be363a1e93da63803c2..85d52a573bfaf5e6ec77465a929fa6ebf6347373 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -193,6 +193,7 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv
                 vlc_object_release (p_helper);
                 p_helper = NULL;
             }
+            vlc_object_attach (p_helper, p_this);
 
             /* Initialization done.
              * Release the mutex to unblock other instances */
@@ -374,7 +375,10 @@ void system_End( libvlc_int_t *p_this )
     }
     if (p_helper && p_helper->p_parent == VLC_OBJECT(p_this) )
     {
-        /* FIXME: thread-safety + join the thread(?)... */
+        /* FIXME: thread-safety... */
+        SendMessage( NULL, WM_QUIT, 0, 0 );
+        vlc_thread_join (p_helper);
+        vlc_object_detach (p_helper);
         vlc_object_release (p_helper);
         p_helper = NULL;
     }