github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use return value of GetProcessExecPath

Browse Source
This commit is contained in:
Kevin Sawicki
2017-02-06 08:34:28 -08:00
parent 1178915f30
commit 1b3d3b6b75
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
atom/browser/browser_win.cc
View File

@@ -54,8 +54,8 @@ bool GetProcessExecPath(base::string16* exe) {
}
bool GetProtocolLaunchPath(mate::Arguments* args, base::string16* exe) {
if (!args->GetNext(exe)) {
GetProcessExecPath(exe);
if (!args->GetNext(exe) && !GetProcessExecPath(exe)) {
return false;
}
// Read in optional args arg
@@ -71,8 +71,8 @@ bool GetProtocolLaunchPath(mate::Arguments* args, base::string16* exe) {
bool FormatCommandLineString(base::string16* exe,
const std::vector<base::string16>& launch_args) {
if (exe->empty()) {
GetProcessExecPath(exe);
if (exe->empty() && !GetProcessExecPath(exe)) {
return false;
}
if (!launch_args.empty()) {
@@ -278,9 +278,9 @@ void Browser::SetLoginItemSettings(LoginItemSettings settings) {
if (settings.open_at_login) {
base::string16 exe = settings.path;
if (!FormatCommandLineString(&exe, settings.args)) return;
key.WriteValue(GetAppUserModelID(), exe.c_str());
if (FormatCommandLineString(&exe, settings.args)) {
key.WriteValue(GetAppUserModelID(), exe.c_str());
}
} else {
key.DeleteValue(GetAppUserModelID());
}