diff -r ceeb73e410b5 -r acc370d7f2f6 ImagePrint/ImagePrintEngine/DeviceProtocols/upnpprotocolfw2/src/cupnpprintingdevice.cpp --- a/ImagePrint/ImagePrintEngine/DeviceProtocols/upnpprotocolfw2/src/cupnpprintingdevice.cpp Thu Jan 07 12:46:28 2010 +0200 +++ b/ImagePrint/ImagePrintEngine/DeviceProtocols/upnpprotocolfw2/src/cupnpprintingdevice.cpp Mon Jan 18 20:19:34 2010 +0200 @@ -1108,10 +1108,14 @@ iState = EUPnPDiscovery; iTriedReadCacheAndFail = EFalse; } - else + else if(iDiscoveryObserver) { iDiscoveryObserver->DiscoveryStatusL(EDiscoveryFinished, KErrNone, 0); } + else + { + User::LeaveIfNull(iDiscoveryObserver); + } LOG("[CUPnPPrintingDevice]\t SendPrinterListL end"); } @@ -1354,9 +1358,13 @@ { printer = static_cast (User::LeaveIfNull(iPrinterContainer->Printer(printerIndex))); + SubmitJobToPcpL(*(printer->Device()), aDeviceID); } + else + { + User::LeaveIfNull(printer); + } - SubmitJobToPcpL(*(printer->Device()), aDeviceID); } //--------------------------------------------------------------------------------------------