From 99e04e7d97ec3d73af6cb28a5309c9ab9d2c4b73 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 17 Jan 2011 23:31:46 -0500
Subject: [PATCH] Some ensurance against :downloads cleanup handler not being
 called.

---
 common/modules/downloads.jsm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/modules/downloads.jsm b/common/modules/downloads.jsm
index 3e6670f9..2070c7bb 100644
--- a/common/modules/downloads.jsm
+++ b/common/modules/downloads.jsm
@@ -198,9 +198,11 @@ var DownloadList = Class("DownloadList",
         for (let row in iter(services.downloadManager.DBConnection
                                      .createStatement("SELECT id FROM moz_downloads")))
             this.addDownload(row.id);
-
+    },
+    initialize: function initialize() {
         util.addObserver(this);
         services.downloadManager.addListener(this);
+        return this.nodes.list;
     },
     cleanup: function cleanup() {
         this.observe.unregister();
@@ -286,7 +288,7 @@ var Downloads = Module("downloads", {
                         get: function params() downloads,
                         set: function params(val) { throw FailedAssertion("Not replacing mode change handler", 1) }
                     });
-                    return downloads.nodes.list;
+                    return downloads.initialize();
                 });
             });
     },