summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-19 19:00:47 (UTC)
committer mickeyl <mickeyl>2003-03-19 19:00:47 (UTC)
commita83c7aed577b15e23a8baf7c21af61f4b40ffbb0 (patch) (unidiff)
tree1e1f97737e9c6cb2b05fb89c84248b9643827555
parent28be0fcc9bda71175c3ee17e79fce2ac24340ff2 (diff)
downloadopie-a83c7aed577b15e23a8baf7c21af61f4b40ffbb0.zip
opie-a83c7aed577b15e23a8baf7c21af61f4b40ffbb0.tar.gz
opie-a83c7aed577b15e23a8baf7c21af61f4b40ffbb0.tar.bz2
fix patch for pnum=0;
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qte234-for-opie091-sigsegv.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/qt/qte234-for-opie091-sigsegv.patch b/qt/qte234-for-opie091-sigsegv.patch
index 858030f..9111b42 100644
--- a/qt/qte234-for-opie091-sigsegv.patch
+++ b/qt/qte234-for-opie091-sigsegv.patch
@@ -1,27 +1,27 @@
1 --- qt-2.3.4/src/kernel/qwindowsystem_qws.cpp~sigsegv2003-03-18 18:29:00.000000000 -0600 1 --- ./src/kernel/qwindowsystem_qws.cpp~sigsegv2003-03-18 18:29:00.000000000 -0600
2 +++ qt-2.3.4/src/kernel/qwindowsystem_qws.cpp2003-03-18 19:09:08.000000000 -0600 2 +++ ./src/kernel/qwindowsystem_qws.cpp2003-03-18 19:09:08.000000000 -0600
3@@ -843,6 +843,16 @@ 3@@ -843,6 +843,16 @@
4 { 4 {
5 } 5 }
6 6
7+static void catchSegvSignal( int ) 7+static void catchSegvSignal( int )
8+{ 8+{
9+#ifndef QT_NO_QWS_KEYBOARD 9+#ifndef QT_NO_QWS_KEYBOARD
10+ if ( qwsServer ) 10+ if ( qwsServer )
11 +qwsServer->closeKeyboard(); 11 +qwsServer->closeKeyboard();
12+#endif 12+#endif
13+ QWSServer::closedown(); 13+ QWSServer::closedown();
14+} 14+}
15+ 15+
16+ 16+
17 /*! 17 /*!
18 \class QWSServer qwindowsystem_qws.h 18 \class QWSServer qwindowsystem_qws.h
19 \brief Server-specific functionality in Qt/Embedded 19 \brief Server-specific functionality in Qt/Embedded
20@@ -912,6 +922,7 @@ 20@@ -912,6 +922,7 @@
21 } 21 }
22 22
23 signal(SIGPIPE, ignoreSignal); //we get it when we read 23 signal(SIGPIPE, ignoreSignal); //we get it when we read
24+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash 24+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
25 #endif 25 #endif
26 focusw = 0; 26 focusw = 0;
27 mouseGrabber = 0; 27 mouseGrabber = 0;