Skip to content
Snippets Groups Projects
Commit dfd7b01f authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

Fix an auto-completion crash when the PhoneDirectory have exactly 2 items

Refs #38116
parent ff63bd65
Branches
Tags
No related merge requests found
...@@ -256,7 +256,7 @@ void NumberCompletionModelPrivate::updateModel() ...@@ -256,7 +256,7 @@ void NumberCompletionModelPrivate::updateModel()
void NumberCompletionModelPrivate::getRange(QMap<QString,NumberWrapper*> map, const QString& prefix, QSet<ContactMethod*>& set) const void NumberCompletionModelPrivate::getRange(QMap<QString,NumberWrapper*> map, const QString& prefix, QSet<ContactMethod*>& set) const
{ {
if (prefix.isEmpty()) if (prefix.isEmpty() || map.isEmpty())
return; return;
QMap<QString,NumberWrapper*>::iterator iBeg = map.begin(); QMap<QString,NumberWrapper*>::iterator iBeg = map.begin();
QMap<QString,NumberWrapper*>::iterator iEnd = map.end ()-1; QMap<QString,NumberWrapper*>::iterator iEnd = map.end ()-1;
...@@ -302,7 +302,7 @@ void NumberCompletionModelPrivate::getRange(QMap<QString,NumberWrapper*> map, co ...@@ -302,7 +302,7 @@ void NumberCompletionModelPrivate::getRange(QMap<QString,NumberWrapper*> map, co
size = ::ceil(size/2.0f); size = ::ceil(size/2.0f);
} }
while (iBeg.key().left(prefixLen) != pref && iBeg != iEnd) while (iBeg.key().left(prefixLen) != pref && iBeg != map.end() && iBeg != iEnd)
++iBeg; ++iBeg;
if (iEnd == iBeg && iBeg.key().left(prefixLen) != pref) { if (iEnd == iBeg && iBeg.key().left(prefixLen) != pref) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment