From f35dddee2f40a0a5edbd3c7afd0b1c19404ae3b6 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 23 Nov 2015 18:01:26 -0800
Subject: [PATCH] Reregister config schema when package is reactivated

Signed-off-by: Nathan Sobo <nathan@github.com>
---
 src/package.coffee | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/package.coffee b/src/package.coffee
index 5ff008ec7..08b434583 100644
--- a/src/package.coffee
+++ b/src/package.coffee
@@ -85,7 +85,7 @@ class Package
         @loadMenus()
         @loadStylesheets()
         @loadDeserializers()
-        @registerConfigSchemaFromMetadata()
+        @configSchemaRegisteredOnLoad = @registerConfigSchemaFromMetadata()
         @settingsPromise = @loadSettings()
         if @shouldRequireMainModuleOnLoad() and not @mainModule?
           @requireMainModule()
@@ -130,7 +130,7 @@ class Package
   activateNow: ->
     try
       @requireMainModule() unless @mainModule?
-      @registerConfigSchemaFromMainModule()
+      @configSchemaRegisteredOnActivate = @registerConfigSchemaFromMainModule()
       @registerViewProviders()
       @activateStylesheets()
       if @mainModule? and not @mainActivated
@@ -146,16 +146,16 @@ class Package
   registerConfigSchemaFromMetadata: ->
     if configSchema = @metadata.configSchema
       @config.setSchema @name, {type: 'object', properties: configSchema}
-      @configSchemaRegistered = true
+      true
+    else
+      false
 
   registerConfigSchemaFromMainModule: ->
-    return if @configSchemaRegistered
-
-    if @mainModule?
+    if @mainModule? and not @configSchemaRegisteredOnLoad
       if @mainModule.config? and typeof @mainModule.config is 'object'
         @config.setSchema @name, {type: 'object', properties: @mainModule.config}
-
-    @configSchemaRegistered = true
+        return true
+    false
 
   activateStylesheets: ->
     return if @stylesheetsActivated
@@ -382,6 +382,7 @@ class Package
     @activationPromise = null
     @resolveActivationPromise = null
     @activationCommandSubscriptions?.dispose()
+    @configSchemaRegisteredOnActivate = false
     @deactivateResources()
     @deactivateKeymaps()
     if @mainActivated