Author: toshok
Date: 2006-09-11 21:29:33 -0400 (Mon, 11 Sep 2006)
New Revision: 65268
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
* XplatUIX11.cs: deal with queue being null, which happens in all
the Clipboard functions. Fixes one of the two problems mentioned
in #78612.
2006-09-11 Chris Toshok <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-09-12 01:11:55 UTC (rev 65267)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-09-12 01:29:33 UTC (rev 65268)
@@ -1,5 +1,11 @@
2006-09-11 Chris Toshok <[EMAIL PROTECTED]>
+ * XplatUIX11.cs: deal with queue being null, which happens in all
+ the Clipboard functions. Fixes one of the two problems mentioned
+ in #78612.
+
+2006-09-11 Chris Toshok <[EMAIL PROTECTED]>
+
* MenuAPI.cs: rework OnMouseUp a bit so that releasing the mouse
button on various spots (including outside the menu) works closer
to MS, and doesn't crash. Fixes #79343.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2006-09-12 01:11:55 UTC (rev 65267)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2006-09-12 01:29:33 UTC (rev 65268)
@@ -1172,13 +1172,15 @@
}
if (pending == 0) {
- int timeout;
+ int timeout = 0;
- if ((queue != null) && (queue.Paint.Count > 0))
{
- return;
+ if (queue != null) {
+ if (queue.Paint.Count > 0)
+ return;
+
+ timeout = NextTimeout
(queue.timer_list, now);
}
- timeout = NextTimeout (queue.timer_list, now);
if (timeout > 0) {
#if __MonoCS__
Syscall.poll (pollfds, (uint)
pollfds.Length, timeout);
@@ -1193,7 +1195,8 @@
}
}
- CheckTimers (queue.timer_list, now);
+ if (queue != null)
+ CheckTimers (queue.timer_list, now);
while (true) {
XEvent xevent = new XEvent ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches