Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla Bug 338454, implement correct restart in AppRunner for BeOS, p=sergei_d, r=thesuckiestemail, sr=benjamin

Browse Source
This commit is contained in:
sergei_d%fi.tartu.ee 2006-06-08 18:20:07 +00:00
parent acfa788133
commit 5af268e657
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/xre/nsAppRunner.cpp
View File

@ -25,6 +25,7 @@
* Ben Goodger <ben@mozilla.org>
* Fredrik Holmqvist <thesuckiestemail@yahoo.se>
* Ben Turner <mozilla@songbirdnest.com>
* Sergei Dolgov <sergei_d@fi.tartu.ee>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -125,8 +126,7 @@
#endif
#ifdef XP_BEOS
//BeOS has execve in unistd, but it doesn't work well enough.
//It leaves zombies around until the app that launched Firefox is closed.
// execv() behaves bit differently in R5 and Zeta, looks unreliable in such situation
//#include <unistd.h>
#include <AppKit.h>
#include <AppFileInfo.h>
@ -138,7 +138,7 @@
#ifdef XP_OS2
#include <process.h>
#endif
#endif
#ifdef XP_MACOSX
#include "nsILocalFileMac.h"
@ -1203,6 +1203,12 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative,
#elif defined(XP_UNIX)
if (execv(exePath.get(), gRestartArgv) == -1)
return NS_ERROR_FAILURE;
#elif defined(XP_BEOS)
extern char **environ;
status_t res;
res = resume_thread(load_image(gRestartArgc,(const char **)gRestartArgv,(const char **)environ));
if (res != B_OK)
return NS_ERROR_FAILURE;
#else
PRProcess* process = PR_CreateProcess(exePath.get(), gRestartArgv,
nsnull, nsnull);

8
toolkit/xre/nsNativeAppSupportBeOS.cpp
View File

@ -19,6 +19,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Sergei Dolgov <sergei_d@fi.tartu.ee>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -148,7 +149,12 @@ nsNativeAppSupportBeOS::Stop(PRBool *aResult)
NS_IMETHODIMP
nsNativeAppSupportBeOS::Quit()
{
return NS_OK;
if (be_app->Lock())
{
be_app->Quit();
return NS_OK;
}
return NS_ERROR_FAILURE;
}
NS_IMETHODIMP