summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-19 06:02:26 (UTC)
committer kergoth <kergoth>2003-03-19 06:02:26 (UTC)
commit18c6c51705de3b1897f671e54b25929e74d11f23 (patch) (side-by-side diff)
tree07985c88705bd017000428c7d6556ccbec1eeb0a
parent33d238e79564e01e48372543aec4c0a39be27460 (diff)
downloadopie-18c6c51705de3b1897f671e54b25929e74d11f23.zip
opie-18c6c51705de3b1897f671e54b25929e74d11f23.tar.gz
opie-18c6c51705de3b1897f671e54b25929e74d11f23.tar.bz2
err, helps to shutdown the qws server after catching the segv, otherwise itll just close the keyboard over and over until the end of time! *chuckles*
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qte234-for-opie091-sigsegv.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/qt/qte234-for-opie091-sigsegv.patch b/qt/qte234-for-opie091-sigsegv.patch
index b04accf..858030f 100644
--- a/qt/qte234-for-opie091-sigsegv.patch
+++ b/qt/qte234-for-opie091-sigsegv.patch
@@ -1,26 +1,27 @@
--- qt-2.3.4/src/kernel/qwindowsystem_qws.cpp~sigsegv 2003-03-18 18:29:00.000000000 -0600
+++ qt-2.3.4/src/kernel/qwindowsystem_qws.cpp 2003-03-18 19:09:08.000000000 -0600
-@@ -843,6 +843,15 @@
+@@ -843,6 +843,16 @@
{
}
+static void catchSegvSignal( int )
+{
+#ifndef QT_NO_QWS_KEYBOARD
+ if ( qwsServer )
+ qwsServer->closeKeyboard();
+#endif
++ QWSServer::closedown();
+}
+
+
/*!
\class QWSServer qwindowsystem_qws.h
\brief Server-specific functionality in Qt/Embedded
-@@ -912,6 +921,7 @@
+@@ -912,6 +922,7 @@
}
signal(SIGPIPE, ignoreSignal); //we get it when we read
+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
#endif
focusw = 0;
mouseGrabber = 0;