зеркало из https://github.com/mozilla/pjs.git
fixes bug 300488 "firefox -remote applies pending updates while main process still running" r+a=bsmedberg
This commit is contained in:
Родитель
8de93d4125
Коммит
f6ba585c6d
|
@ -1963,11 +1963,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if defined(MOZ_UPDATER)
|
||||
// Check for and process any available updates
|
||||
ProcessUpdates(dirProvider.GetAppDir(), gRestartArgc, gRestartArgv);
|
||||
#endif
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
|
||||
// setup for private colormap. Ideally we'd like to do this
|
||||
// in nsAppShell::Create, but we need to get in before gtk
|
||||
|
@ -2067,6 +2062,11 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
|
|||
}
|
||||
#endif
|
||||
|
||||
#if defined(MOZ_UPDATER)
|
||||
// Check for and process any available updates
|
||||
ProcessUpdates(dirProvider.GetAppDir(), gRestartArgc, gRestartArgv);
|
||||
#endif
|
||||
|
||||
nsCOMPtr<nsIProfileLock> profileLock;
|
||||
PRBool startOffline = PR_FALSE;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче