From 7ba2f1657bad06f3f199dfd36de0341ff0d1fdb0 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 7 Jan 2011 13:13:56 -0500
Subject: [PATCH] Fix error reported at startup.

---
 common/content/dactyl.js   | 2 +-
 common/modules/overlay.jsm | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 47879022..a01a98b9 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1035,8 +1035,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
                 case dactyl.NEW_WINDOW:
                     let win = window.openDialog(document.documentURI, "_blank", "chrome,all,dialog=no");
-                    win.loadURI(url, null, postdata);
                     browser = win.getBrowser();
+                    browser.loadURIWithFlags(url, flags, null, null, postdata);
                     return win.content;
                 }
             }
diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm
index 25565d79..07937f4c 100644
--- a/common/modules/overlay.jsm
+++ b/common/modules/overlay.jsm
@@ -252,9 +252,10 @@ var Overlay = Module("Overlay", {
                 }
 
                 for each (let module in defineModule.modules)
-                    defineModule.time(module.constructor.className, "init",
-                                      module.INIT.init, module,
-                                      modules.dactyl, modules, window);
+                    if (module.INIT.init)
+                        defineModule.time(module.constructor.className, "init",
+                                          module.INIT.init, module,
+                                          modules.dactyl, modules, window);
 
                 defineModule.modules.map(init);