Bug 887357 - Fix: Nightly ignores command line flags in pinned taskbar shortcuts. r=bbondy

This commit is contained in:
Jim Mathies 2013-06-26 14:12:14 -05:00
parent 2c1144af61
commit 51943458b5

View File

@ -579,7 +579,7 @@ void CExecuteCommandVerb::LaunchDesktopBrowser()
// If a taskbar shortcut, link or local file is clicked, the target will
// be the browser exe or file.
CStringW params;
if (!IsTargetBrowser()) {
if (!IsTargetBrowser() && !mTarget.IsEmpty()) {
// Fallback to the module path if it failed to get the default browser.
GetDefaultBrowserPath(browserPath);
params += "-url ";
@ -588,6 +588,12 @@ void CExecuteCommandVerb::LaunchDesktopBrowser()
params += "\"";
}
// Tack on any extra parameters we received (for example -profilemanager)
if (!mParameters.IsEmpty()) {
params += " ";
params += mParameters;
}
Log(L"Desktop Launch: verb:%s exe:%s params:%s", mVerb, browserPath, params);
SHELLEXECUTEINFOW seinfo;