diff -r 2717213c588a -r 171fae344dd4 graphicsdeviceinterface/bitgdi/tbit/TDefect2.cpp --- a/graphicsdeviceinterface/bitgdi/tbit/TDefect2.cpp Tue Jun 22 15:21:29 2010 +0300 +++ b/graphicsdeviceinterface/bitgdi/tbit/TDefect2.cpp Fri Jul 16 11:45:55 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-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" @@ -2125,13 +2125,18 @@ DeleteGraphicsContext(); DeleteScreenDevice(); TRAPD(err, iScrDev = CFbsScreenDevice::NewL(aScreenNo, aDisplayMode)); - if(err == KErrNotSupported) + if ( !iScrDev ) { + TESTE( err == KErrNotSupported, err ); return err; } TEST(err == KErrNone); TEST(iScrDev->ScreenNo() == aScreenNo); err = iScrDev->CreateContext((CGraphicsContext*&)iGc); + if ( !iGc ) + { + return err; + } TEST(err == KErrNone); iGc->SetUserDisplayMode(aDisplayMode); iScrDev->ChangeScreenDevice(NULL);