Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Fix broken array concat behavior. The + turns it from an array into a…
Browse files Browse the repository at this point in the history
… string on Windows (new node behavior?). Definitely wrong.

This fix is to help with #5938

Fixes #6369

Auditors: @bbondy, @bridiver
  • Loading branch information
bsclifton committed Dec 21, 2016
1 parent 3c39b44 commit c2468b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 3 additions & 1 deletion app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,9 @@ app.on('ready', () => {
prefsRestartCallbacks[message] = (buttonIndex, persist) => {
delete prefsRestartCallbacks[message]
if (buttonIndex === 0) {
app.relaunch({args: process.argv.slice(1) + ['--relaunch']})
const args = process.argv.slice(1)
args.push('--relaunch')
app.relaunch({args})
app.quit()
} else {
delete prefsRestartLastValue[config]
Expand Down
1 change: 0 additions & 1 deletion app/sessionStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ const setVersionInformation = (data) => {
{name: 'os.platform', version: os.platform()},
{name: 'os.release', version: os.release()},
{name: 'os.arch', version: os.arch()}
// TODO(bsclifton): read the latest commit hash from a file, etc.
]
data.about = data.about || {}
data.about.brave = {
Expand Down

0 comments on commit c2468b9

Please sign in to comment.