diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
| commit | 2d652d1c355c8bdde03a6c278b5b7b444424e394 (patch) | |
| tree | 0ea18eabc7d3cdec78e59701e10e15a662af6641 /browser/app/nsBrowserApp.cpp | |
| parent | 2782832f265a8e0a7923ca885b431907cde7cc49 (diff) | |
| parent | e8417003899a4ec9274815be30352c1328fc32e9 (diff) | |
| download | UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.gz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.lz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.xz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.zip | |
Merge branch 'master' into ported-upstream
Diffstat (limited to 'browser/app/nsBrowserApp.cpp')
| -rw-r--r-- | browser/app/nsBrowserApp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index 981e2f14c..ac2e85ea3 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -25,7 +25,7 @@ #ifdef XP_WIN #ifdef MOZ_ASAN -// ASAN requires firefox.exe to be built with -MD, and it's OK if we don't +// ASAN requires basilisk.exe to be built with -MD, and it's OK if we don't // support Windows XP SP2 in ASAN builds. #define XRE_DONT_SUPPORT_XPSP2 #endif @@ -84,7 +84,7 @@ static void Output(const char *fmt, ... ) decltype(MessageBoxW)* messageBoxW = (decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW"); if (messageBoxW) { - messageBoxW(nullptr, wide_msg, L"Firefox", MB_OK + messageBoxW(nullptr, wide_msg, L"Basilisk", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); } @@ -170,7 +170,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory) nsresult rv; uint32_t mainFlags = 0; - // Allow firefox.exe to launch XULRunner apps via -app <application.ini> + // Allow basilisk.exe to launch XULRunner apps via -app <application.ini> // Note that -app must be the *first* argument. const char *appDataFile = getenv("XUL_APP_FILE"); if (appDataFile && *appDataFile) { |