diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js index 6fa06279a..452a83a4d 100644 --- a/js/ui/extensionDownloader.js +++ b/js/ui/extensionDownloader.js @@ -130,12 +130,14 @@ function updateExtension(uuid) { FileUtils.recursivelyMoveDir(extensionDir, oldExtensionTmpDir); FileUtils.recursivelyMoveDir(newExtensionTmpDir, extensionDir); - let extension = ExtensionUtils.createExtensionObject(uuid, extensionDir, ExtensionUtils.ExtensionType.PER_USER); + let extension = null; try { + extension = ExtensionUtils.createExtensionObject(uuid, extensionDir, ExtensionUtils.ExtensionType.PER_USER); ExtensionSystem.loadExtension(extension); } catch(e) { - ExtensionSystem.unloadExtension(extension); + if (extension) + ExtensionSystem.unloadExtension(extension); logError(e, 'Error loading extension %s'.format(uuid)); @@ -242,9 +244,8 @@ const InstallExtensionDialog = new Lang.Class({ global.settings.set_strv(ExtensionSystem.ENABLED_EXTENSIONS_KEY, enabledExtensions); } - let extension = ExtensionUtils.createExtensionObject(uuid, dir, ExtensionUtils.ExtensionType.PER_USER); - try { + let extension = ExtensionUtils.createExtensionObject(uuid, dir, ExtensionUtils.ExtensionType.PER_USER); ExtensionSystem.loadExtension(extension); } catch(e) { uninstallExtension(uuid); diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js index a4dc29eea..fc359e6ac 100644 --- a/js/ui/extensionSystem.js +++ b/js/ui/extensionSystem.js @@ -199,7 +199,14 @@ function reloadExtension(oldExtension) { unloadExtension(oldExtension); // Now, recreate the extension and load it. - let newExtension = ExtensionUtils.createExtensionObject(uuid, dir, type); + let newExtension; + try { + newExtension = ExtensionUtils.createExtensionObject(uuid, dir, type); + } catch(e) { + logExtensionError(uuid, e); + return; + } + loadExtension(newExtension); }