← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~linuxdcpp-team/linuxdcpp/trunk] Rev 349: Fixed an issue with the GUI randomly freezing

 

------------------------------------------------------------
revno: 349
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-02-01 22:01:05 -0600
message:
  Fixed an issue with the GUI randomly freezing
modified:
  Changelog.txt
  linux/wulformanager.cc


--
lp:linuxdcpp
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk

Your team LinuxDC++ Team is subscribed to branch lp:linuxdcpp.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/trunk/+edit-subscription.
=== modified file 'Changelog.txt'
--- Changelog.txt	2010-01-31 03:49:41 +0000
+++ Changelog.txt	2010-02-02 04:01:05 +0000
@@ -42,6 +42,7 @@
 [2009-12-31] lp#397365: Fixed sorting of "Time Left" column in transfers view. (Steven)
 [2010-01-07] lp#473173: Crash when hashing files. Added missing SIGBUS handler. (Razzloss)
 [2010-01-30] lp#321246: Fixed a crash in debug builds due to bad nick conversion handling. (Steven)
+[2010-02-01] lp#502673: Fixed an issue with the GUI randomly freezing. (Steven)
 
 *** 1.0.3 2009-02-01 ***
 [2008-08-10] lp#256236: Fixed a crash on startup when using auto-open options.

=== modified file 'linux/wulformanager.cc'
--- linux/wulformanager.cc	2009-06-16 23:54:40 +0000
+++ linux/wulformanager.cc	2010-02-02 04:01:05 +0000
@@ -22,6 +22,7 @@
 #include "wulformanager.hh"
 
 #include <iostream>
+#include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 #include "hashdialog.hh"
 #include "settingsdialog.hh"
@@ -190,7 +191,9 @@
 		}
 		g_mutex_unlock(guiQueueMutex);
 
-		gdk_flush();
+		// Don't call gdk_flush() since it actually calls XSync, which can
+		// block waiting on events
+		XFlush(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
 		gdk_threads_leave();
 	}