mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-27 07:34:20 +00:00
merging patch to trunk for bug 158380 - The browser desktop icon doesn't work when launching mozilla -mail -turbo. r=jewell,morse,ssu sr=jag
This commit is contained in:
parent
1e15d1cd0f
commit
2d0ab6461d
@ -2482,6 +2482,16 @@ nsNativeAppSupportWin::StartServerMode() {
|
||||
// We dont have to anything anymore. The native UI
|
||||
// will create the window
|
||||
return NS_OK;
|
||||
} else {
|
||||
// Sometimes a window will have been opened even though mShouldShowUI is false
|
||||
// (e.g., mozilla -mail -turbo). Detect that by testing whether there's a
|
||||
// window already open.
|
||||
nsCOMPtr<nsIDOMWindowInternal> win;
|
||||
GetMostRecentWindow( 0, getter_AddRefs( win ) );
|
||||
if ( win ) {
|
||||
// Window already opened, don't need this special Nav window.
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
// Since native UI wont create any window, we create a hidden window
|
||||
|
Loading…
x
Reference in New Issue
Block a user