Changeset 1224

Timestamp:

Apr 29, 2007 12:31:51 PM (18 years ago)

Author:

bennylp

Message:

Fixed ticket #242: Crash on Windows when no sound device is available

Location:

pjproject/branches/split-3rd-party

Files:

• pjsip-apps/src/pjsua/main.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/branches/split-3rd-party/pjsip-apps/src/pjsua/main.c

@@ -83 +83 @@
     app_destroy();
 
+    /* This is on purpose */
+    app_destroy();
+
     return 0;
 }

pjproject/branches/split-3rd-party/pjsip-apps/src/pjsua/pjsua_app.c

@@ -96 +96 @@
 static void stereo_demo();
 #endif
+pj_status_t app_destroy(void);
 
 /*****************************************************************************
@@ -3087 +3088 @@
 
 on_error:
-    pjsua_destroy();
+    app_destroy();
     return status;
 }
@@ -3099 +3100 @@
     status = pjsua_start();
     if (status != PJ_SUCCESS) {
-        pjsua_destroy();
+        app_destroy();
         return status;
     }

pjproject/branches/split-3rd-party/pjsip/src/pjsua-lib/pjsua_core.c

@@ -918 +918 @@
         pjsua_var.pool = NULL;
         pj_caching_pool_destroy(&pjsua_var.cp);
-    }
-
-
-    PJ_LOG(4,(THIS_FILE, "PJSUA destroyed..."));
-
-    /* End logging */
-    if (pjsua_var.log_file) {
-        pj_file_close(pjsua_var.log_file);
-        pjsua_var.log_file = NULL;
-    }
-
-    /* Shutdown PJLIB */
-    pj_shutdown();
+
+        PJ_LOG(4,(THIS_FILE, "PJSUA destroyed..."));
+
+        /* End logging */
+        if (pjsua_var.log_file) {
+            pj_file_close(pjsua_var.log_file);
+            pjsua_var.log_file = NULL;
+        }
+
+        /* Shutdown PJLIB */
+        pj_shutdown();
+    }
 
     /* Clear pjsua_var */

pjproject/branches/split-3rd-party/pjsip/src/pjsua-lib/pjsua_media.c

@@ -477 +477 @@
         pjmedia_endpt_destroy(pjsua_var.med_endpt);
         pjsua_var.med_endpt = NULL;
-    }
-
-    /* Deinitialize sound subsystem */
-    pjmedia_snd_deinit();
+
+        /* Deinitialize sound subsystem */
+        pjmedia_snd_deinit();
+    }
 
     /* Reset RTP port */