telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp
changeset 69 b982c3e940f3
parent 44 8b72faa1200f
child 73 70d75957b98f
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp	Mon Aug 09 17:43:08 2010 +0100
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp	Tue Sep 14 17:55:14 2010 +0100
@@ -173,11 +173,13 @@
 
             if ( KErrNone != leaveCode )
                 {
-                ReqCompleted( aTsyReqHandle, leaveCode );
+				// reset request handle to indicate the request is no longer ongoing
+                iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle);
+                ReqCompleted( aTsyReqHandle, leaveCode );				
                 }
 
             // save request handle
-            if ( EMultimodeBroadcastReqHandleUnknown != iReqHandleType )
+            else if ( EMultimodeBroadcastReqHandleUnknown != iReqHandleType )
                 {
 #ifdef REQHANDLE_TIMER
                 SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
@@ -186,10 +188,10 @@
                 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, 
                     aTsyReqHandle );
 #endif // REQHANDLE_TIMER
-                // We've finished with this value now. Clear it so it doesn't leak
-                //  up to any other instances of this method down the call stack
-                iReqHandleType = EMultimodeBroadcastReqHandleUnknown;
                 }
+            // We've finished with this value now. Clear it so it doesn't leak
+            //  up to any other instances of this method down the call stack
+            iReqHandleType = EMultimodeBroadcastReqHandleUnknown;
             break;
         }