Changeset 2379 for pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp

Timestamp:

Dec 17, 2008 11:36:22 AM (14 years ago)

Author:

nanang

Message:

Ticket #675:

• Fixed ICE+STUN panic E32User-CBASE 46, the problem seems to be inside the Symbian version of pjsua_handle_events().
• Updated minor things, e.g: compile warnings

File:

• pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp (modified) (6 diffs)

pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp

@@ -90 +90 @@
 CPjTimeoutTimer::~CPjTimeoutTimer()
 {
-    if (IsActive())
-        Cancel();
+    Cancel();
     timer_.Close();
 }
@@ -116 +115 @@
 void CPjTimeoutTimer::StartTimer(TUint miliSeconds)
 {
-    if (IsActive())
-        Cancel();
+    Cancel();
 
     hasTimedOut_ = PJ_FALSE;
@@ -330 +328 @@
     err = os->Initialize();
     if (err != KErrNone)
-        return status;
+        return PJ_RETURN_OS_ERROR(err);
     
     /* Initialize exception ID for the pool. 
@@ -453 +451 @@
     
     if (priority==-1)
-        priority = CActive::EPriorityStandard;
+        priority = EPriorityNull;
     
     if (ms_timeout >= 0) {
@@ -464 +462 @@
         bool timer_is_active = timer->IsActive();
     
-        if (timer_is_active)
-            timer->Cancel();
+        timer->Cancel();
         
         delete timer;
@@ -623 +620 @@
 {
     User::After(msec*1000);
-    
-    TInt aError;
-    while (CActiveScheduler::RunIfReady(aError, EPriorityMuchLess))
-        ;
-    
+
     return PJ_SUCCESS;
 }