From fa67577a4fed292a42296c14901d7379c2e41ce0 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 19 Aug 2003 02:30:10 +0000
Subject: [PATCH] improve output

---
 stepmania/src/archutils/Unix/CrashHandlerChild.cpp | 10 ++++++----
 stepmania/src/archutils/Win32/Crash.cpp            |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
index 5913ed2b54..83c0c696c0 100644
--- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
@@ -17,6 +17,7 @@
 #include "CrashHandler.h"
 #include "CrashHandlerInternal.h"
 #include "RageLog.h" /* for RageLog::GetAdditionalLog, etc. only */
+#include "ProductInfo.h"
 
 #if defined(DARWIN)
 #include "archutils/Darwin/Crash.h"
@@ -361,11 +362,12 @@ static void child_process()
         exit(1);
     }
 
-    fprintf(CrashDump, "StepMania crash report");
+    fprintf(CrashDump, "%s crash report", PRODUCT_NAME_VER );
 #if defined(HAVE_VERSION_INFO)
-    fprintf(CrashDump, " -- build %u", version_num);
+    fprintf(CrashDump, " (build %u)", version_num);
 #endif
-    fprintf(CrashDump, "\n--------------------------------------\n");
+    fprintf(CrashDump, "\n");
+    fprintf(CrashDump, "--------------------------------------\n");
     fprintf(CrashDump, "\n");
 
     CString Signal;
@@ -434,7 +436,7 @@ static void child_process()
 #else
     fprintf(stderr,
             "\n"
-            "StepMania has crashed.  Debug information has been output to\n"
+            PRODUCT_NAME " has crashed.  Debug information has been output to\n"
             "\n"
             "    /tmp/crashinfo.txt\n"
             "\n"
diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp
index a55c5f51a7..b05a626956 100644
--- a/stepmania/src/archutils/Win32/Crash.cpp
+++ b/stepmania/src/archutils/Win32/Crash.cpp
@@ -29,6 +29,7 @@
 #include "crash.h"
 #include "disasm.h"
 #include "CrashList.h"
+#include "ProductInfo.h"
 
 #include "RageLog.h" /* for RageLog::GetAdditionalLog only */
 #include "RageThreads.h" /* for GetCheckpointLogs */
@@ -1361,9 +1362,9 @@ static void DoSave(const EXCEPTION_POINTERS *pExc) {
 		return;
 
 	Report(NULL, hFile,
-			"StepMania crash report -- build %d\r\n"
+			"%s crash report (build %d)\r\n"
 			"--------------------------------------"
-			"\r\n", version_num);
+			"\r\n", PRODUCT_NAME_VER, version_num);
 
 	// Detect operating system.
 
@@ -1470,10 +1471,10 @@ BOOL APIENTRY CrashDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
 			case IDC_CRASH_SAVE:
 				if (!s_bHaveCallstack)
 					if (IDOK != MessageBox(hDlg,
-						"StepMania cannot load its crash resource file, and thus the crash dump will be "
+						PRODUCT_NAME " cannot load its crash resource file, and thus the crash dump will be "
 						"missing the most important part, the call stack. Crash dumps are much less useful "
 						"without the call stack.",
-						"StepMania warning", MB_OK|MB_ICONEXCLAMATION))
+						PRODUCT_NAME " warning", MB_OK|MB_ICONEXCLAMATION))
 						return TRUE;
 
 				ViewWithNotepad("crashinfo.txt");