skypiax: let's the API thread die on unload module on win32

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16818 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_skypiax/mod_skypiax.c b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
index 95fbc9dc668a9193686f752531a5b7628f7d1013..4b6a70175d9a597df1ee2d217c24e6a1952d28a9 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/mod_skypiax.c
+++ b/src/mod/endpoints/mod_skypiax/mod_skypiax.c
@@ -1790,7 +1790,10 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown)
                if (strlen(globals.SKYPIAX_INTERFACES[interface_id].name)) {
                        if (globals.SKYPIAX_INTERFACES[interface_id].skypiax_signaling_thread) {
 #ifdef WIN32
+                               skypiax_signaling_write(tech_pvt, "DIE");
+                               switch_sleep(10000);
                                switch_file_write(tech_pvt->SkypiaxHandles.fdesc[1], "sciutati", &howmany);     // let's the controldev_thread die
+                               
 #else /* WIN32 */
                                howmany = write(tech_pvt->SkypiaxHandles.fdesc[1], "sciutati", howmany);
 #endif /* WIN32 */
@@ -1800,8 +1803,10 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown)
 #ifdef WIN32
                                if (SendMessage(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) {    // let's the skypiax_api_thread_func die
                                        DEBUGA_SKYPE("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPIAX_P_LOG, GetLastError());
-                                       globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
+                                       //globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
                                }
+                               
+//cicopet
 #else
                                if (tech_pvt->SkypiaxHandles.disp) {
                                        XEvent e;

diff --git a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
index cba6465e0d2de4d4065d91ca4e8cca0be8e4a98e..24e3e935c44faee9a2fb6e18131d0b41c2d38523 100644 (file)
--- a/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
+++ b/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
@@ -1315,8 +1315,15 @@ LRESULT APIENTRY skypiax_present(HWND hWindow, UINT uiMessage, WPARAM uiParam, L
        lReturnCode = 0;
        fIssueDefProc = 0;
        tech_pvt = (private_t *) GetWindowLong(hWindow, GWL_USERDATA);
-       if (!running)
+       //if (!running)
+       //      return lReturnCode;
+
+       if(!running){
+               DEBUGA_SKYPE("let's DIE!\n", SKYPIAX_P_LOG);
+               tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle = NULL;
+               PostQuitMessage(0);
                return lReturnCode;
+                               }
        switch (uiMessage) {
        case WM_CREATE:
                tech_pvt = (private_t *) ((LPCREATESTRUCT) ulParam)->lpCreateParams;