--- a/psmservices/psmserver/src/client/psmclientimpl.cpp Wed Mar 31 23:31:40 2010 +0300
+++ b/psmservices/psmserver/src/client/psmclientimpl.cpp Wed Apr 14 17:17:45 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -64,22 +64,10 @@
{
COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::~CPsmClientImpl()" ) ) );
- if ( iActive->IsActive() )
- {
- CancelPowerSaveModeChange();
- }
+ CancelPowerSaveModeChange();
- if ( iActive )
- {
- delete iActive;
- iActive = NULL;
- }
-
- if ( iSettings )
- {
- delete iSettings;
- iSettings = NULL;
- }
+ delete iActive;
+ delete iSettings;
iPsmServer.Close();