equal
deleted
inserted
replaced
196 { |
196 { |
197 if ( iOperationCode == EMTPOpCodeSendObjectInfo ) |
197 if ( iOperationCode == EMTPOpCodeSendObjectInfo ) |
198 { |
198 { |
199 delete iObjectInfo; |
199 delete iObjectInfo; |
200 iObjectInfo = NULL; |
200 iObjectInfo = NULL; |
|
201 Rollback(); |
201 iProgress = EObjectNone; |
202 iProgress = EObjectNone; |
202 } |
203 } |
203 else if ( iOperationCode == EMTPOpCodeSendObjectPropList ) |
204 else if ( iOperationCode == EMTPOpCodeSendObjectPropList ) |
204 { |
205 { |
205 delete iObjectPropList; |
206 delete iObjectPropList; |
206 iObjectPropList = NULL; |
207 iObjectPropList = NULL; |
|
208 Rollback(); |
207 iProgress = EObjectNone; |
209 iProgress = EObjectNone; |
208 } |
210 } |
209 } |
211 } |
210 else |
212 else |
211 { |
213 { |
326 |
328 |
327 MmMtpDpUtility::SetPSStatus(EMtpPSStatusActive); |
329 MmMtpDpUtility::SetPSStatus(EMtpPSStatusActive); |
328 |
330 |
329 if ( iProgress == EObjectNone ) |
331 if ( iProgress == EObjectNone ) |
330 { |
332 { |
|
333 // iCancelled could have been set after the last transaction |
|
334 // reset the flag here |
|
335 iCancelled = EFalse; |
|
336 |
331 if ( iOperationCode == EMTPOpCodeSendObjectInfo ) |
337 if ( iOperationCode == EMTPOpCodeSendObjectInfo ) |
332 { |
338 { |
333 ServiceInfoL(); |
339 ServiceInfoL(); |
334 } |
340 } |
335 else |
341 else |