Attachment 4436 Details for Bug 27534

[patch] Might help a little

try-to-die-less-often.patch (text/plain), 1.78 KB, created by Andreas Büsching on 2012-06-12 10:47 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Büsching

Created: 2012-06-12 10:47 CEST

Size: 1.78 KB

patch

obsolete

>Index: thread-wait-for-terminate.patch
>===================================================================
>--- thread-wait-for-terminate.patch	(Revision 0)
>+++ thread-wait-for-terminate.patch	(Revision 0)
>@@ -0,0 +1,12 @@
>+# I'm not sure if this helps, but terminate() is according to the Qt documentation bad and should not be used
>+--- italc-2.0.0.orig/lib/src/ItalcVncConnection.cpp	2011-08-03 23:18:00.000000000 +0200
>++++ italc-2.0.0/lib/src/ItalcVncConnection.cpp	2012-06-11 16:48:32.000000000 +0200
>+@@ -375,7 +375,7 @@
>+ 		m_stopped = true;
>+ 		m_updateIntervalSleeper.wakeAll();
>+ 
>+-		if( !wait( 1000 ) )
>++		if( !wait() )
>+ 		{
>+ 			qWarning( "ItalcVncConnection::stop(): terminating thread" );
>+ 			terminate();
>Index: debian/changelog
>===================================================================
>--- debian/changelog	(Revision 33134)
>+++ debian/changelog	(Arbeitskopie)
>@@ -1,3 +1,10 @@
>+italc (1:2.0.7-1) unstable; urgency=low
>+
>+  * ItalcVncConnection::stop: wait as long as possible before trying to
>+    kill a thread with terminate; Bug #27432
>+
>+ -- Andreas BÃ¼sching <buesching@univention.de>  Mon, 11 Jun 2012 16:53:01 +0200
>+
> italc (1:2.0.6-1) unstable; urgency=low
> 
>   * stateChanged: change attribute type from enum States to int; Bug #25702
>Index: debian/rules
>===================================================================
>--- debian/rules	(Revision 33134)
>+++ debian/rules	(Arbeitskopie)
>@@ -39,6 +39,7 @@
> override_dh_clean:
> 	tar xvfj italc-2.0.0.tar.bz2 --strip-components=1
> 	patch -p1 -i qt-signals.patch
>+	patch -p1 -i thread-wait-for-terminate.patch
> 	dh_clean
> 
> override_dh_install:

Actions: View | Diff

Attachments on bug 27534: 4436 | 5161