Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/69647cc6a4f230fc0c1ce...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/69647cc6a4f230fc0c1ce54...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/69647cc6a4f230fc0c1ce5481...
The branch, master has been updated
via 69647cc6a4f230fc0c1ce5481a30ac21c93db8d2 (commit)
from 04825c62df92c8adef3f40f89c7b5d88b963f833 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/69647cc6a4f230fc0c1...
commit 69647cc6a4f230fc0c1ce5481a30ac21c93db8d2
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Respond to Ctrl-C by immediately quitting. TCP/IP stack exit expects this.
diff --git a/amiga/gui.c b/amiga/gui.c
index a1a9468..47d75bc 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2108,11 +2108,12 @@ void ami_get_msg(void)
ULONG winsignal = 1L << sport->mp_SigBit;
ULONG appsig = 1L << appport->mp_SigBit;
ULONG schedulesig = 1L << msgport->mp_SigBit;
+ ULONG ctrlcsig = SIGBREAKF_CTRL_C;
ULONG signal;
struct TimerRequest *timermsg = NULL;
struct MsgPort *printmsgport = ami_print_get_msgport();
ULONG printsig = 1L << printmsgport->mp_SigBit;
- ULONG signalmask = winsignal | appsig | schedulesig | rxsig | printsig | applibsig;
+ ULONG signalmask = winsignal | appsig | schedulesig | rxsig | printsig | applibsig |
ctrlcsig;
signal = Wait(signalmask);
/*
@@ -2144,6 +2145,11 @@ printf("sig recvd %ld (%ld %ld %ld %ld %ld %ld)\n",
signal, winsignal , appsig ,
schedule_run(FALSE);
}
}
+
+ if(signal & ctrlcsig)
+ {
+ ami_quit_netsurf();
+ }
}
void gui_poll(bool active)
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index a1a9468..47d75bc 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2108,11 +2108,12 @@ void ami_get_msg(void)
ULONG winsignal = 1L << sport->mp_SigBit;
ULONG appsig = 1L << appport->mp_SigBit;
ULONG schedulesig = 1L << msgport->mp_SigBit;
+ ULONG ctrlcsig = SIGBREAKF_CTRL_C;
ULONG signal;
struct TimerRequest *timermsg = NULL;
struct MsgPort *printmsgport = ami_print_get_msgport();
ULONG printsig = 1L << printmsgport->mp_SigBit;
- ULONG signalmask = winsignal | appsig | schedulesig | rxsig | printsig | applibsig;
+ ULONG signalmask = winsignal | appsig | schedulesig | rxsig | printsig | applibsig |
ctrlcsig;
signal = Wait(signalmask);
/*
@@ -2144,6 +2145,11 @@ printf("sig recvd %ld (%ld %ld %ld %ld %ld %ld)\n",
signal, winsignal , appsig ,
schedule_run(FALSE);
}
}
+
+ if(signal & ctrlcsig)
+ {
+ ami_quit_netsurf();
+ }
}
void gui_poll(bool active)
--
NetSurf Browser