diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/location/qgeosatelliteinfosource_s60.cpp --- a/qtmobility/src/location/qgeosatelliteinfosource_s60.cpp Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/src/location/qgeosatelliteinfosource_s60.cpp Fri May 14 16:41:33 2010 +0300 @@ -238,6 +238,26 @@ } } } + + if (index != -1) + return index; + + bool minSet = false; + microSeconds = 0; + + for (TInt i = 0 ; i < mListSize; i++) { + if (mList[i].mIsAvailable + && (mList[i].mStatus != TPositionModuleStatus::EDeviceUnknown) + && (mList[i].mStatus != TPositionModuleStatus::EDeviceError) + && (((aBits >> i) & 1))) { + if (!minSet || (mList[i].mTimeToFirstFix < microSeconds)) { + index = i; + minSet = true; + microSeconds = mList[i].mTimeToFirstFix; + } + } + } + return index; }