From f6079ea3fd334cf85488e6c0211b8b64492d02d2 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Mon, 3 Aug 2015 18:26:28 +0200
Subject: [PATCH] Bug 1188688 - Frequent "TypeError:
 this._searchSuggestionController is null" when using the location bar.
 r=ttaubert

--HG--
extra : commitid : 4GgebUU3vpj
---
 toolkit/components/places/UnifiedComplete.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/toolkit/components/places/UnifiedComplete.js b/toolkit/components/places/UnifiedComplete.js
index c26c983adcaa..baec92b630f4 100644
--- a/toolkit/components/places/UnifiedComplete.js
+++ b/toolkit/components/places/UnifiedComplete.js
@@ -941,6 +941,9 @@ Search.prototype = {
       );
     let promise = this._searchSuggestionController.fetchCompletePromise
       .then(() => {
+        // The search has been canceled already.
+        if (!this._searchSuggestionController)
+          return;
         if (this._searchSuggestionController.resultsCount >= 0 &&
             this._searchSuggestionController.resultsCount < 2) {
           // The original string is used to properly compare with the next search.