Merge branch 'client-crash-HOT-fix' into server-configs

rmisio · rmisio · commit edd2f8f73ed7 · 2016-04-29T10:23:05.000-07:00
diff --git a/main.js b/main.js
@@ -245,7 +245,8 @@ var iShouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory)
   }
   return true;
 });
-if(iShouldQuit){app.quit();return;}
+
+if (iShouldQuit) app.quit();
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function() {

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,8 @@ var iShouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory)`
`245`	`245`	`}`
`246`	`246`	`return true;`
`247`	`247`	`});`
`248`		`-if(iShouldQuit){app.quit();return;}`
	`248`	`+`
	`249`	`+if (iShouldQuit) app.quit();`
`249`	`250`
`250`	`251`	`// Quit when all windows are closed.`
`251`	`252`	`app.on('window-all-closed', function() {`