mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-10-31 15:47:10 -04:00
Move ExceptionCatchingApplication class to its own header
This commit is contained in:
parent
e50e712fdd
commit
e83b91de95
45
ExceptionCatchingApplication.hpp
Normal file
45
ExceptionCatchingApplication.hpp
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
#ifndef EXCEPTION_CATCHING_APPLICATION_HPP__
|
||||||
|
#define EXCEPTION_CATCHING_APPLICATION_HPP__
|
||||||
|
|
||||||
|
#include <QApplication>
|
||||||
|
|
||||||
|
#include "widgets/MessageBox.hpp"
|
||||||
|
|
||||||
|
class QObject;
|
||||||
|
class QEvent;
|
||||||
|
|
||||||
|
//
|
||||||
|
// We can't use the GUI after QApplication::exit() is called so
|
||||||
|
// uncaught exceptions can get lost on Windows systems where there is
|
||||||
|
// no console terminal, so here we override QApplication::notify() and
|
||||||
|
// wrap the base class call with a try block to catch and display
|
||||||
|
// exceptions in a message box.
|
||||||
|
//
|
||||||
|
class ExceptionCatchingApplication
|
||||||
|
: public QApplication
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit ExceptionCatchingApplication (int& argc, char * * argv)
|
||||||
|
: QApplication {argc, argv}
|
||||||
|
{
|
||||||
|
}
|
||||||
|
bool notify (QObject * receiver, QEvent * e) override
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return QApplication::notify (receiver, e);
|
||||||
|
}
|
||||||
|
catch (std::exception const& e)
|
||||||
|
{
|
||||||
|
MessageBox::critical_message (nullptr, "Fatal error", e.what ());
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
catch (...)
|
||||||
|
{
|
||||||
|
MessageBox::critical_message (nullptr, "Unexpected fatal error");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
36
main.cpp
36
main.cpp
@ -9,7 +9,6 @@
|
|||||||
#include <QSharedMemory>
|
#include <QSharedMemory>
|
||||||
#include <QTemporaryFile>
|
#include <QTemporaryFile>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QApplication>
|
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
#include <QTranslator>
|
#include <QTranslator>
|
||||||
#include <QRegularExpression>
|
#include <QRegularExpression>
|
||||||
@ -28,6 +27,7 @@
|
|||||||
#include <QSqlQuery>
|
#include <QSqlQuery>
|
||||||
#include <QSqlError>
|
#include <QSqlError>
|
||||||
|
|
||||||
|
#include "ExceptionCatchingApplication.hpp"
|
||||||
#include "Logger.hpp"
|
#include "Logger.hpp"
|
||||||
#include "revision_utils.hpp"
|
#include "revision_utils.hpp"
|
||||||
#include "MetaDataRegistry.hpp"
|
#include "MetaDataRegistry.hpp"
|
||||||
@ -63,38 +63,6 @@ namespace
|
|||||||
}
|
}
|
||||||
} seeding;
|
} seeding;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// We can't use the GUI after QApplication::exit() is called so
|
|
||||||
// uncaught exceptions can get lost on Windows systems where there
|
|
||||||
// is no console terminal, so here we override
|
|
||||||
// QApplication::notify() and wrap the base class call with a try
|
|
||||||
// block to catch and display exceptions in a message box.
|
|
||||||
class ExceptionCatchingApplication final
|
|
||||||
: public QApplication
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
explicit ExceptionCatchingApplication (int& argc, char * * argv)
|
|
||||||
: QApplication {argc, argv}
|
|
||||||
{
|
|
||||||
}
|
|
||||||
bool notify (QObject * receiver, QEvent * e) override
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return QApplication::notify (receiver, e);
|
|
||||||
}
|
|
||||||
catch (std::exception const& e)
|
|
||||||
{
|
|
||||||
MessageBox::critical_message (nullptr, "Fatal error", e.what ());
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
MessageBox::critical_message (nullptr, "Unexpected fatal error");
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
@ -248,7 +216,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
// Create a unique writeable temporary directory in a suitable location
|
// Create a unique writeable temporary directory in a suitable location
|
||||||
bool temp_ok {false};
|
bool temp_ok {false};
|
||||||
QString unique_directory {QApplication::applicationName ()};
|
QString unique_directory {ExceptionCatchingApplication::applicationName ()};
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
if (!temp_dir.mkpath (unique_directory)
|
if (!temp_dir.mkpath (unique_directory)
|
||||||
|
Loading…
Reference in New Issue
Block a user