Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)

1 files changed, 6 insertions, 3 deletions

diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
index 648394b6f..2f92098ca 100644
--- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp
@@ -186,12 +186,15 @@ void PopupMenuItemModel::select(int index)
     if (!item.enabled)
         return;
 
-    Item& oldItem = m_items[oldIndex];
-    oldItem.selected = false;
     item.selected = true;
     m_selectedModelIndex = index;
 
-    emit dataChanged(this->index(oldIndex), this->index(oldIndex));
+    if (oldIndex != -1) {
+        Item& oldItem = m_items[oldIndex];
+        oldItem.selected = false;
+        emit dataChanged(this->index(oldIndex), this->index(oldIndex));
+    }
+
     emit dataChanged(this->index(index), this->index(index));
 }