Skip to content

Commit ace5bc7

Browse files
committed
Revert 68071
1 parent 616b746 commit ace5bc7

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

object_creator/creator_main.cpp

+1-21
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@
2222
#include <QtWidgets/qsplashscreen.h>
2323
#include <QtGui/qpainter.h>
2424

25-
//Required by the sigaction function in the exit_handler
26-
#if defined(_WIN32)
27-
#include "platform_win.h"
28-
#else
29-
#include <csignal>
30-
#endif
31-
3225
#ifdef _WIN32
3326
#include <QtCore/QtPlugin>
3427
Q_IMPORT_PLUGIN( QWindowsIntegrationPlugin );
@@ -52,20 +45,7 @@ void exit_handler( int s )
5245

5346
catacurses::endwin();
5447

55-
// As suggested by https://github.com/CleverRaven/Cataclysm-DDA/pull/67893
56-
#if !defined(_WIN32)
57-
if( s == 2 ) {
58-
struct sigaction sigIntHandler;
59-
sigIntHandler.sa_handler = SIG_DFL;
60-
sigemptyset( &sigIntHandler.sa_mask );
61-
sigIntHandler.sa_flags = 0;
62-
sigaction( SIGINT, &sigIntHandler, nullptr );
63-
kill( getpid(), s );
64-
} else
65-
#endif
66-
{
67-
exit( exit_status );
68-
}
48+
exit( exit_status );
6949
}
7050
inp_mngr.set_timeout( old_timeout );
7151
}

0 commit comments

Comments
 (0)