mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
* GuiApplication::notify():
- don't crash with abort() but exit gracefully when an exception is caught. - try to catch LyX specific exceptions. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20419 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
ee40d49bea
commit
24a74bdb53
@ -17,10 +17,12 @@
|
||||
#include "qt_helpers.h"
|
||||
#include "GuiImage.h"
|
||||
|
||||
#include "frontends/alert.h"
|
||||
#include "frontends/LyXView.h"
|
||||
|
||||
#include "graphics/LoaderQueue.h"
|
||||
|
||||
#include "support/ExceptionMessage.h"
|
||||
#include "support/FileName.h"
|
||||
#include "support/lstrings.h"
|
||||
#include "support/os.h"
|
||||
@ -283,15 +285,25 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event)
|
||||
try {
|
||||
return_value = QApplication::notify(receiver, event);
|
||||
}
|
||||
catch (support::ExceptionMessage const & e) {
|
||||
if (e.type_ == support::ErrorException) {
|
||||
Alert::error(e.title_, e.details_);
|
||||
LyX::cref().emergencyCleanup();
|
||||
::exit(1);
|
||||
} else if (e.type_ == support::WarningException) {
|
||||
Alert::warning(e.title_, e.details_);
|
||||
return return_value;
|
||||
}
|
||||
}
|
||||
catch (std::exception const & e) {
|
||||
lyxerr << "Caught \"normal\" exception: " << e.what() << endl;
|
||||
LyX::cref().emergencyCleanup();
|
||||
abort();
|
||||
::exit(1);
|
||||
}
|
||||
catch (...) {
|
||||
lyxerr << "Caught some really weird exception..." << endl;
|
||||
LyX::cref().emergencyCleanup();
|
||||
abort();
|
||||
::exit(1);
|
||||
}
|
||||
|
||||
return return_value;
|
||||
|
Loading…
Reference in New Issue
Block a user