diff -r 06ff229162e9 -r 11d3954df52a src/hbcore/image/hbiconsource.cpp --- a/src/hbcore/image/hbiconsource.cpp Fri May 14 16:09:54 2010 +0300 +++ b/src/hbcore/image/hbiconsource.cpp Thu May 27 13:10:59 2010 +0300 @@ -274,16 +274,16 @@ QByteArray* HbIconSource::byteArray() { if (!mByteArray) { - #ifdef HB_NVG_CS_ICON +#ifdef HB_NVG_CS_ICON QFile file(mFilename); if (!file.open(QIODevice::NotOpen | QIODevice::ReadOnly)) { return 0; } - mByteArray = new QByteArray (file.readAll()); - #endif//nvg + mByteArray = new QByteArray(file.readAll()); +#endif } - if (!mByteArray->isEmpty()) { + if (mByteArray && !mByteArray->isEmpty()) { return mByteArray; } else { return 0;