equal
deleted
inserted
replaced
156 for ( TInt j=0; j<subServiceIds.Count(); j++ ) |
156 for ( TInt j=0; j<subServiceIds.Count(); j++ ) |
157 { |
157 { |
158 CScpSubService* subService = |
158 CScpSubService* subService = |
159 service->GetSubService( subServiceIds[ j ] ); |
159 service->GetSubService( subServiceIds[ j ] ); |
160 |
160 |
161 // Don't remove if there is at least one enabled or disconnectin |
161 // Don't remove if there is at least one enabled or disconnecting |
162 // sub service |
162 // sub service |
163 if( subService->EnableRequestedState() == CScpSubService::EScpEnabled || |
163 if( subService && ( |
164 subService->State() == ECCHDisconnecting ) |
164 subService->EnableRequestedState() == CScpSubService::EScpEnabled || |
|
165 subService->State() == ECCHDisconnecting ) ) |
165 { |
166 { |
166 remove = EFalse; |
167 remove = EFalse; |
167 } |
168 } |
168 else |
169 else if ( subService ) |
169 { |
170 { |
170 service->RemoveSubService( subService->Id() ); |
171 service->RemoveSubService( subService->Id() ); |
171 } |
172 } |
172 } |
173 } |
173 } |
174 } |
470 |
471 |
471 for( TInt j=0; j<subServiceIds.Count(); j++ ) |
472 for( TInt j=0; j<subServiceIds.Count(); j++ ) |
472 { |
473 { |
473 CScpSubService* subService = service->GetSubService( subServiceIds[ j ] ); |
474 CScpSubService* subService = service->GetSubService( subServiceIds[ j ] ); |
474 |
475 |
475 //if( subService->IsEnabled() ) |
476 if( subService && |
476 if( subService->EnableRequestedState() == CScpSubService::EScpEnabled ) |
477 subService->EnableRequestedState() == CScpSubService::EScpEnabled ) |
477 { |
478 { |
478 enabledSubServices++; |
479 enabledSubServices++; |
479 } |
480 } |
480 } |
481 } |
481 |
482 |