From 1363d30f7915e4b4ae116dd6cd29ca215bd2cf72 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 29 Jun 2012 01:40:17 -0400
Subject: [PATCH] extensionUtils: Don't crash on startup for an empty directory

https://bugzilla.gnome.org/show_bug.cgi?id=679099
---
 js/misc/extensionUtils.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/js/misc/extensionUtils.js b/js/misc/extensionUtils.js
index cec24ba1d..40e001bbe 100644
--- a/js/misc/extensionUtils.js
+++ b/js/misc/extensionUtils.js
@@ -177,7 +177,14 @@ const ExtensionFinder = new Lang.Class({
                 log('Extension %s already installed in %s. %s will not be loaded'.format(uuid, existing.path, extensionDir.get_path()));
                 continue;
             }
-            let extension = createExtensionObject(uuid, extensionDir, type);
+
+            let extension;
+            try {
+                extension = createExtensionObject(uuid, extensionDir, type);
+            } catch(e) {
+                logError(e, 'Could not load extension %s'.format(uuid));
+                continue;
+            }
             this.emit('extension-found', extension);
         }
         fileEnum.close(null);