From b095319a1645f80f30f7f7744314194b7454f33c Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 6 Apr 2012 14:03:51 -0400
Subject: [PATCH] extensionSystem: Make it a non-fatal error to re-load an
 extension

https://bugzilla.gnome.org/show_bug.cgi?id=673613
---
 js/ui/extensionSystem.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index fb811c2fb..f9ba89d6f 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -249,7 +249,8 @@ function loadExtension(dir, type, enabled) {
     let extension;
 
     if (ExtensionUtils.extensions[uuid] != undefined) {
-        throw new Error('extension already loaded');
+        global.logError('Extension "%s" is already loaded'.format(uuid));
+        return;
     }
 
     try {