github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wl-electron-35

Browse Source
This commit is contained in:
Wliu
2016-01-08 16:57:04 +00:00
parent d855613340 dd1eb750fe
commit 91b2dc5b9c
17 changed files with 92 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/browser/atom-application.coffee
View File

@@ -69,8 +69,7 @@ class AtomApplication
@pidsToOpenWindows = {}
@windows = []
disableAutoUpdate = require(path.join(@resourcePath, 'package.json'))._disableAutoUpdate ? false
@autoUpdateManager = new AutoUpdateManager(@version, options.test, disableAutoUpdate)
@autoUpdateManager = new AutoUpdateManager(@version, options.test, @resourcePath)
@applicationMenu = new ApplicationMenu(@version, @autoUpdateManager)
@atomProtocolHandler = new AtomProtocolHandler(@resourcePath, @safeMode)