Merge pull request #21862 from lodr/bug-1039984-smartcollections-and-…

…homescreen Bug 1039984 - [System] Trying to open a smartcollection after killing th...
mozilla-b2g · Jul 22, 2014 · 382dc87 · 382dc87
1 parent 579a8c8
commit 382dc87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/apps/system/js/app_window.js b/apps/system/js/app_window.js
@@ -388,7 +388,9 @@
       return;
     }
 
-    this._killed = true;
+    if (!this.isHomescreen) {
+      this._killed = true;
+    }
 
     if (DEBUG) {
       AppWindow[this.instanceID] = null;

diff --git a/apps/system/js/homescreen_window.js b/apps/system/js/homescreen_window.js
@@ -156,11 +156,6 @@
     }
   };
 
-  HomescreenWindow.prototype.kill = function hw_kill() {
-    this.destroy();
-    this.publish('terminated');
-  };
-
   HomescreenWindow.prototype.view = function hw_view() {
     return '<div class="appWindow homescreen" id="homescreen">' +
               '<div class="fade-overlay"></div>' +