From 9917708b8229f00601896e8e065d0b93b6841f6e Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Thu, 5 Aug 2010 18:31:58 +0200
Subject: [PATCH] Bug 584478 - Resource alias registered too early [r=mconnor]

---
 services/sync/Weave.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/sync/Weave.js b/services/sync/Weave.js
index a113fe5803a..bfa28a26e86 100644
--- a/services/sync/Weave.js
+++ b/services/sync/Weave.js
@@ -56,12 +56,13 @@ WeaveService.prototype = {
     switch (topic) {
     case "app-startup":
       let os = Cc["@mozilla.org/observer-service;1"].
-        getService(Ci.nsIObserverService);
+               getService(Ci.nsIObserverService);
       os.addObserver(this, "final-ui-startup", true);
-      this.addResourceAlias();
       break;
 
     case "final-ui-startup":
+      this.addResourceAlias();
+
       // Force Weave service to load if it hasn't triggered from overlays
       this.timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
       this.timer.initWithCallback({