backed out changeset b798fd098e09 (bug 1042561) for assertion failure in mochitests
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 20 Mar 2015 13:32:28 +0100
changeset 251858 9d219be15f7dbde7ed3ebc963cefb1a51d3c0150
parent 251857 d00d886006d3d8fcd20ffbe8ba42467fa44cde42
child 251859 62b25fdb0b790d4631a1c434463340590befcf52
push id1156
push userpbrosset@mozilla.com
push dateFri, 20 Mar 2015 16:00:24 +0000
bugs1042561
milestone39.0a1
backs outb798fd098e098dfd313176d15879db399d62bc55
backed out changeset b798fd098e09 (bug 1042561) for assertion failure in mochitests
toolkit/components/autocomplete/nsAutoCompleteController.cpp
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -1500,17 +1500,17 @@ nsAutoCompleteController::ProcessResult(
     uint32_t minResults;
     input->GetMinResultsForPopup(&minResults);
 
     // Make sure the popup is open, if necessary, since we now have at least one
     // search result ready to display. Don't force the popup closed if we might
     // get results in the future to avoid unnecessarily canceling searches.
     if (mRowCount || !minResults) {
       OpenPopup();
-    } else if (mSearchesOngoing == 0) {
+    } else if (result != nsIAutoCompleteResult::RESULT_NOMATCH_ONGOING) {
       ClosePopup();
     }
   }
 
   if (result == nsIAutoCompleteResult::RESULT_SUCCESS ||
       result == nsIAutoCompleteResult::RESULT_SUCCESS_ONGOING) {
     // Try to autocomplete the default index for this search.
     CompleteDefaultIndex(resultIndex);