equal
deleted
inserted
replaced
53 iNumItemsAdded = 0; |
53 iNumItemsAdded = 0; |
54 iTotalNewTracks = 0; |
54 iTotalNewTracks = 0; |
55 iInitialCount = 0; |
55 iInitialCount = 0; |
56 isCollectionDBChanged = EFalse; |
56 isCollectionDBChanged = EFalse; |
57 iAsyncEvent = ECmdIdle; |
57 iAsyncEvent = ECmdIdle; |
|
58 iRefreshEnd = EFalse; |
58 |
59 |
59 } |
60 } |
60 |
61 |
61 |
62 |
62 // --------------------------------------------------------------------------- |
63 // --------------------------------------------------------------------------- |
181 else |
182 else |
182 { |
183 { |
183 iCancelScan = ETrue; |
184 iCancelScan = ETrue; |
184 } |
185 } |
185 |
186 |
186 // When stop refreshing library, prompt a process waiting dialog. |
187 if (!iRefreshEnd) |
187 // Inform user to wait for the updating library. |
188 { |
188 HBufC* waitText = StringLoader::LoadLC( R_MPX_UPDATING_LIBRARY_TXT ); |
189 // When stop refreshing library, prompt a process waiting dialog. |
189 DisplayProcessWaitDialogL( R_MPX_GENERIC_WAIT_NOTE, *waitText ); |
190 // Inform user to wait for the updating library. |
190 CleanupStack::PopAndDestroy( waitText ); |
191 HBufC* waitText = StringLoader::LoadLC( R_MPX_UPDATING_LIBRARY_TXT ); |
|
192 DisplayProcessWaitDialogL( R_MPX_GENERIC_WAIT_NOTE, *waitText ); |
|
193 CleanupStack::PopAndDestroy( waitText ); |
|
194 } |
191 } |
195 } |
192 else if( iScanningError >= KErrNone ) |
196 else if( iScanningError >= KErrNone ) |
193 { |
197 { |
194 // Show completed scan note |
198 // Show completed scan note |
195 // |
199 // |
352 musicCollectionId.iUid, EMPXCollectionCountTotal ); |
356 musicCollectionId.iUid, EMPXCollectionCountTotal ); |
353 |
357 |
354 } |
358 } |
355 if( op == EMcMsgRefreshStart ) |
359 if( op == EMcMsgRefreshStart ) |
356 { |
360 { |
|
361 iRefreshEnd = EFalse; |
357 isCollectionDBChanged = EFalse; |
362 isCollectionDBChanged = EFalse; |
358 MPX_DEBUG1("refreshStart store the initial count"); |
363 MPX_DEBUG1("refreshStart store the initial count"); |
359 iInitialCount = songTotal; |
364 iInitialCount = songTotal; |
360 } |
365 } |
361 |
366 |
394 } |
399 } |
395 break; |
400 break; |
396 } |
401 } |
397 }; |
402 }; |
398 |
403 |
|
404 iRefreshEnd = ETrue; |
399 // If cancel was pressed, iWaitDialog is NULL |
405 // If cancel was pressed, iWaitDialog is NULL |
400 // |
406 // |
401 if( iWaitDialog ) |
407 if( iWaitDialog ) |
402 { |
408 { |
403 MPX_DEBUG1("CMPXScanningWaitDialog::HandleCollectionMessageL killing dialog"); |
409 MPX_DEBUG1("CMPXScanningWaitDialog::HandleCollectionMessageL killing dialog"); |