From 7aa6c1c08e60a58254f36812ddee8eaf47b13da5 Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Fri, 24 May 2013 14:45:48 -0700
Subject: [PATCH] Change how pathsToOpen gets passed around

---
 src/atom-application.coffee | 5 +++--
 src/main.coffee             | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/atom-application.coffee b/src/atom-application.coffee
index cc8ece1af..54019b1b5 100644
--- a/src/atom-application.coffee
+++ b/src/atom-application.coffee
@@ -21,6 +21,7 @@ class AtomApplication
   socketPath: '/tmp/atom.sock'
 
   constructor: ({@resourcePath, @executedFrom, @pathsToOpen, @testMode, @version}) ->
+    @pathsToOpen ?= [@executedFrom] if @executedFrom
     atomApplication = this
     @windows = []
 
@@ -157,8 +158,8 @@ class AtomApplication
   sendCommand: (command) ->
     atomWindow.sendCommand command for atomWindow in @windows when atomWindow.browserWindow.isFocused()
 
-  open: (pathsToOpen = []) ->
-    pathsToOpen = [null] if pathsToOpen.length == 0
+  open: (pathsToOpen) ->
+    pathsToOpen ?= [null]
     for pathToOpen in pathsToOpen
       pathToOpen = path.resolve(@executedFrom, pathToOpen) if @executedFrom and pathToOpen
 
diff --git a/src/main.coffee b/src/main.coffee
index e58e7f941..14e726086 100644
--- a/src/main.coffee
+++ b/src/main.coffee
@@ -18,8 +18,7 @@ getHomeDir = ->
 parseCommandLine = ->
   args = optimist(process.argv[1..]).argv
   executedFrom = args['executed-from'] ? process.cwd()
-  pathsToOpen = args._
-  pathsToOpen = [executedFrom] if pathsToOpen.length is 0 and args['executed-from']
+  pathsToOpen = if args._.length > 0 then args._ else null
   testMode = true if args['test']
   version = String fs.readFileSync(path.join(__dirname, '..', '..', 'version'))