summaryrefslogtreecommitdiff
path: root/library/Console-windows.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2011-07-16 08:00:13 +0200
committerPetr Mrázek2011-07-16 08:00:13 +0200
commit003ad63c56653e421b4570ab71c648df9d4efd98 (patch)
treec8312aa955763a69ccdadd9f478f5b13d1837bfb /library/Console-windows.cpp
parentfd418cd2dcbc0a602ddfe3cb160a6cf2312c8cb5 (diff)
downloaddfhack-003ad63c56653e421b4570ab71c648df9d4efd98.tar.gz
dfhack-003ad63c56653e421b4570ab71c648df9d4efd98.tar.bz2
dfhack-003ad63c56653e421b4570ab71c648df9d4efd98.tar.xz
Disabled ctrl+c on windows (null signal handler). Some small fixes.
Diffstat (limited to 'library/Console-windows.cpp')
-rw-r--r--library/Console-windows.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/Console-windows.cpp b/library/Console-windows.cpp
index e0e5310f..ffbd2a83 100644
--- a/library/Console-windows.cpp
+++ b/library/Console-windows.cpp
@@ -40,8 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <conio.h>
#include <stdarg.h>
-#include "dfhack/extra/stdiostream.h"
-#include < process.h>
+#include <process.h>
#include <errno.h>
#include <stdio.h>
#include <fcntl.h>
@@ -453,6 +452,7 @@ bool Console::init(void)
GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),&oldMode);
newMode = oldMode | ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT;
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),newMode);
+ SetConsoleCtrlHandler(NULL,true);
std::ios::sync_with_stdio();
// make our own weird streams so our IO isn't redirected