Skip to content

Commit

Permalink
Initialize ProtocolHandlerInstaller after initializing Config
Browse files Browse the repository at this point in the history
This allows it to correctly read `core.uriHandlerRegistration` and
avoids popping the notification even if set to 'never'.

Fixes atom#16201
  • Loading branch information
segevfiner committed Dec 16, 2017
1 parent bba2c47 commit 5490a8b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/atom-environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,13 @@ class AtomEnvironment {
this.themes.initialize({configDirPath: this.configDirPath, resourcePath, safeMode, devMode})

this.commandInstaller.initialize(this.getVersion())
this.protocolHandlerInstaller.initialize(this.config, this.notifications)
this.uriHandlerRegistry.registerHostHandler('core', CoreURIHandlers.create(this))
this.autoUpdater.initialize()

this.config.load()

this.protocolHandlerInstaller.initialize(this.config, this.notifications)

this.themes.loadBaseStylesheets()
this.initialStyleElements = this.styles.getSnapshot()
if (params.onlyLoadBaseStyleSheets) this.themes.initialLoadComplete = true
Expand Down

0 comments on commit 5490a8b

Please sign in to comment.