equal
deleted
inserted
replaced
296 { |
296 { |
297 CLOG_WRITE( "CCmWizard::CheckConnDlg is not NULL" ); |
297 CLOG_WRITE( "CCmWizard::CheckConnDlg is not NULL" ); |
298 iCheckConnDlgCancelled = ETrue; |
298 iCheckConnDlgCancelled = ETrue; |
299 } |
299 } |
300 } |
300 } |
|
301 |
|
302 if ( iWait.IsStarted() ) |
|
303 { |
|
304 iWait.AsyncStop(); |
|
305 } |
|
306 iCheckConnDlg = NULL; |
301 } |
307 } |
302 |
308 |
303 // --------------------------------------------------------------------------- |
309 // --------------------------------------------------------------------------- |
304 // CCmWizard::AutoCheckForCmsL |
310 // CCmWizard::AutoCheckForCmsL |
305 // --------------------------------------------------------------------------- |
311 // --------------------------------------------------------------------------- |
384 |
390 |
385 // Dismiss wait dialog |
391 // Dismiss wait dialog |
386 if( !iCheckConnDlgCancelled ) |
392 if( !iCheckConnDlgCancelled ) |
387 { |
393 { |
388 CLOG_WRITE( "CCmWizard::CheckForCms, cancelling wait dlg" ); |
394 CLOG_WRITE( "CCmWizard::CheckForCms, cancelling wait dlg" ); |
389 iCheckConnDlg->SetCallback( NULL ); |
|
390 iCheckConnDlg->ProcessFinishedL(); |
395 iCheckConnDlg->ProcessFinishedL(); |
|
396 |
|
397 // Wait here in case wait note has not yet been dismissed. |
|
398 // This happens in hw when Themes/effects is enabled. |
|
399 if ( iCheckConnDlg != NULL ) |
|
400 { |
|
401 iWait.Start(); |
|
402 } |
391 CLOG_WRITE( "CCmWizard::CheckForCms, wait dialog deleted" ); |
403 CLOG_WRITE( "CCmWizard::CheckForCms, wait dialog deleted" ); |
392 } |
404 } |
393 else |
405 else |
394 { |
406 { |
395 CLOG_WRITE( "CCmWizard::CheckForCms, wait dlg was already cancelled" ); |
407 CLOG_WRITE( "CCmWizard::CheckForCms, wait dlg was already cancelled" ); |
396 } |
408 } |
397 |
409 |
398 |
|
399 // Set the member to NULL every case |
410 // Set the member to NULL every case |
400 iCheckConnDlg = NULL; |
411 iCheckConnDlg = NULL; |
401 } |
412 } |
402 |
413 |
403 |
414 |