summaryrefslogtreecommitdiff
path: root/indra/win_crash_logger/win_crash_logger.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/win_crash_logger/win_crash_logger.cpp')
-rwxr-xr-xindra/win_crash_logger/win_crash_logger.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp
index 8e916ae437..0078559c24 100755
--- a/indra/win_crash_logger/win_crash_logger.cpp
+++ b/indra/win_crash_logger/win_crash_logger.cpp
@@ -28,6 +28,7 @@
#include "stdafx.h"
#include <stdlib.h>
#include "llcrashloggerwindows.h"
+#include <iostream>
int APIENTRY WinMain(HINSTANCE hInstance,
HINSTANCE hPrevInstance,
@@ -35,17 +36,23 @@ int APIENTRY WinMain(HINSTANCE hInstance,
int nCmdShow)
{
llinfos << "Starting crash reporter." << llendl;
-
LLCrashLoggerWindows app;
app.setHandle(hInstance);
app.parseCommandOptions(__argc, __argv);
+ LLSD options = LLApp::instance()->getOptionData(
+ LLApp::PRIORITY_COMMAND_LINE);
+ if (!(options.has("pid") && options.has("dumpdir")))
+ {
+ llwarns << "Insufficient parameters to crash report." << llendl;
+ }
if (! app.init())
{
llwarns << "Unable to initialize application." << llendl;
- return -1;
+ return 1;
}
+ app.processingLoop();
app.mainLoop();
app.cleanup();
llinfos << "Crash reporter finished normally." << llendl;