mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Remove the dual exception messages and strip it down to 1 short one, removing all references to crashlog.txt.

Browse source 
Originally committed to SVN as r3471.
This commit is contained in:
Amar Takhar 2009-09-02 20:46:15 +00:00
parent bf275da4de
commit 01df6ba169
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
aegisub/src/main.cpp
View file

@ -279,12 +279,8 @@ int AegisubApp::OnExit() {
#if !defined(_DEBUG) || defined(WITH_EXCEPTIONS) #if !defined(_DEBUG) || defined(WITH_EXCEPTIONS)
/// DOCME /// Message displayed when an exception has occurred.
const static wxChar unhandled_exception_message[] = _T("Oops, Aegisub has crashed!\n\nI have tried to emergency-save a copy of your file, and a crash log file has been generated.\n\nYou can find the emergency-saved file in:\n%s\n\nIf you submit the crash log to the Aegisub team, we will investigate the problem and attempt to fix it. You can find the crashlog in:\n%s\n\nAegisub will now close."); const static wxString exception_message = _("Oops, Aegisub has crashed!\n\nAn attempt has been made to save a copy of your file to:\n\n%s\n\nAegisub will now close.");
/// DOCME
const static wxChar unhandled_exception_message_nocrashlog[] = _T("Oops, Aegisub has crashed!\n\nI have tried to emergency-save a copy of your file.\n\nYou can find the emergency-saved file in:\n%s\n\nAegisub will now close.");
/// @brief Unhandled exception /// @brief Unhandled exception
/// ///
@ -302,7 +298,7 @@ void AegisubApp::OnUnhandledException() {
AssFile::top->Save(filename,false,false); AssFile::top->Save(filename,false,false);
// Inform user of crash // Inform user of crash
wxMessageBox(wxString::Format(unhandled_exception_message, filename.c_str(), StandardPaths::DecodePath(_T("?user/crashlog.txt")).c_str()), _T("Unhandled exception"), wxOK | wxICON_ERROR, NULL); wxMessageBox(wxString::Format(exception_message, filename.c_str()), _("Program error"), wxOK | wxICON_ERROR, NULL);
} }
@ -326,13 +322,9 @@ void AegisubApp::OnFatalException() {
// Stack walk // Stack walk
StackWalker walker(_T("Fatal exception")); StackWalker walker(_T("Fatal exception"));
walker.WalkFromException(); walker.WalkFromException();
// Inform user of crash
wxMessageBox(wxString::Format(unhandled_exception_message, filename.c_str(), StandardPaths::DecodePath(_T("?user/crashlog.txt")).c_str()), _T("Fatal exception"), wxOK | wxICON_ERROR, NULL);
#else
// Inform user of crash
wxMessageBox(wxString::Format(unhandled_exception_message_nocrashlog, filename.c_str()), _T("Fatal exception"), wxOK | wxICON_ERROR, NULL);
#endif #endif
// Inform user of crash
wxMessageBox(wxString::Format(exception_message, filename.c_str()), _("Program error"), wxOK | wxICON_ERROR, NULL);
} }
#endif #endif