diff -r 0818dd463d41 -r 924385140d98 systemsettings/gssensorplugin/src/gssenbasecontainer.cpp --- a/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Thu Aug 19 10:05:08 2010 +0300 +++ b/systemsettings/gssensorplugin/src/gssenbasecontainer.cpp Tue Aug 31 15:24:25 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -189,7 +189,11 @@ // cleanup checkboxOnIcon, checkboxOffIcon, iconArray CleanupStack::Pop( checkboxOffIcon ); CleanupStack::Pop( checkboxOnIcon ); - CleanupStack::Pop( iconArray ); + + if(iconArray) + { + CleanupStack::Pop( iconArray ); + } TRACE_( "[GSSensorPlugin] CGSSenBaseContainer::AddCheckboxIconsL() - return" ); }