Changeset 3980 for pjproject/trunk

Timestamp:

Mar 20, 2012 9:23:20 AM (13 years ago)

Author:

ming

Message:

Re #1428: Fix returning the correct error status when there is no active media.

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -1297 +1297 @@
                 media_used[j] == 0)
             {
+                pj_status_t status2;
+
                 /* See if it has matching codec. */
-                status = match_offer(pool, prefer_remote_codec_order, 
-                                     om, im, initial, &am);
-                if (status == PJ_SUCCESS) {
+                status2 = match_offer(pool, prefer_remote_codec_order, 
+                                      om, im, initial, &am);
+                if (status2 == PJ_SUCCESS) {
                     /* Mark media as used. */
                     media_used[j] = 1;
                     break;
-                }
+                } else {
+                    status = status2;
+                }
             }
         }