From be309aba6944a6bb99322f218f2abb038361fc54 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 3 Jun 2013 22:24:57 +0800
Subject: [PATCH] Setup crash reporter on 'will-finish-launching' event.

---
 src/atom-application.coffee |  7 -------
 src/main.coffee             | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/atom-application.coffee b/src/atom-application.coffee
index 160de8ef5..865ce6f7a 100644
--- a/src/atom-application.coffee
+++ b/src/atom-application.coffee
@@ -2,7 +2,6 @@ AtomWindow = require './atom-window'
 BrowserWindow = require 'browser-window'
 Menu = require 'menu'
 autoUpdater = require 'auto-updater'
-crashReporter = require 'crash-reporter'
 app = require 'app'
 ipc = require 'ipc'
 dialog = require 'dialog'
@@ -45,7 +44,6 @@ class AtomApplication
     @pathsToOpen ?= []
     @windows = []
 
-    @setupCrashReporter()
     @listenForArgumentsFromNewProcess()
     @setupNodePath()
     @setupJavaScriptArguments()
@@ -89,11 +87,6 @@ class AtomApplication
 
     process.env['NODE_PATH'] = resourcePaths.join path.delimiter
 
-  setupCrashReporter: ->
-    crashReporter.setCompanyName 'GitHub'
-    crashReporter.setSubmissionUrl 'https://speakeasy.githubapp.com/submit_crash_log'
-    crashReporter.setAutoSubmit true
-
   listenForArgumentsFromNewProcess: ->
     fs.unlinkSync socketPath if fs.existsSync(socketPath)
     server = net.createServer (connection) =>
diff --git a/src/main.coffee b/src/main.coffee
index 8ee00fae3..dac0806d7 100644
--- a/src/main.coffee
+++ b/src/main.coffee
@@ -1,5 +1,6 @@
 AtomApplication = require './atom-application'
 autoUpdater = require 'auto-updater'
+crashReporter = require 'crash-reporter'
 delegate = require 'atom-delegate'
 app = require 'app'
 fs = require 'fs'
@@ -23,10 +24,8 @@ delegate.browserMainParts.preMainMessageLoopRun = ->
   app.on 'open-file', addPathToOpen
 
   app.on 'will-finish-launching', ->
-    autoUpdater.setFeedUrl 'https://speakeasy.githubapp.com/apps/27/appcast.xml'
-    autoUpdater.setAutomaticallyChecksForUpdates true
-    autoUpdater.setAutomaticallyDownloadsUpdates true
-    autoUpdater.checkForUpdatesInBackground()
+    setupCrashReporter()
+    setupAutoUpdater()
 
   app.on 'finish-launching', ->
     app.removeListener 'open-file', addPathToOpen
@@ -39,6 +38,17 @@ delegate.browserMainParts.preMainMessageLoopRun = ->
 getHomeDir = ->
   process.env[if process.platform is 'win32' then 'USERPROFILE' else 'HOME']
 
+setupCrashReporter = ->
+  crashReporter.setCompanyName 'GitHub'
+  crashReporter.setSubmissionUrl 'https://speakeasy.githubapp.com/submit_crash_log'
+  crashReporter.setAutoSubmit true
+
+setupAutoUpdater = ->
+  autoUpdater.setFeedUrl 'https://speakeasy.githubapp.com/apps/27/appcast.xml'
+  autoUpdater.setAutomaticallyChecksForUpdates true
+  autoUpdater.setAutomaticallyDownloadsUpdates true
+  autoUpdater.checkForUpdatesInBackground()
+
 parseCommandLine = ->
   version = fs.readFileSync(path.join(__dirname, '..', '..', 'version'), 'utf8')