From 2ef2e709c4c31aa7b46fb0d933d3fc8c2c2d5682 Mon Sep 17 00:00:00 2001
From: Felipe Heidrich <fheidric>
Date: Thu, 24 Sep 2009 18:58:32 +0000
Subject: 142593 - Scrolling a table eventually locks up the entire application

---
 .../win32/org/eclipse/swt/widgets/Table.java       | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java')

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
index 64c5caff9a..1a15a14e0f 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java	
@@ -6315,6 +6315,17 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
 				break;
 			}
 			
+			/*
+			* Feature in Windows.  When a new table item is inserted
+			* using LVM_INSERTITEM in a table that is transparent
+			* (ie. LVM_SETBKCOLOR has been called with CLR_NONE),
+			* TVM_INSERTITEM calls LVN_GETDISPINFO before the item
+			* has been added to the array.  The fix is to check for
+			* null.
+			*/
+			TableItem item = _getItem (plvfi.iItem);
+			if (item == null) break;
+			
 			/*
 			* When an item is being deleted from a virtual table, do not
 			* allow the application to provide data for a new item that
@@ -6324,23 +6335,12 @@ LRESULT wmNotifyChild (NMHDR hdr, int /*long*/ wParam, int /*long*/ lParam) {
 			* in an inconsistent state.  Rather than answering the data
 			* right away, queue a redraw for later.
 			*/
-			if ((style & SWT.VIRTUAL) != 0) {
+			if ((style & SWT.VIRTUAL) != 0 && !item.cached) {
 				if (ignoreShrink) {
 					OS.SendMessage (handle, OS.LVM_REDRAWITEMS, plvfi.iItem, plvfi.iItem);
 					break;
 				}
 			}
-
-			/*
-			* Feature in Windows.  When a new table item is inserted
-			* using LVM_INSERTITEM in a table that is transparent
-			* (ie. LVM_SETBKCOLOR has been called with CLR_NONE),
-			* TVM_INSERTITEM calls LVN_GETDISPINFO before the item
-			* has been added to the array.  The fix is to check for
-			* null.
-			*/
-			TableItem item = _getItem (plvfi.iItem);
-			if (item == null) break;
 			
 			/*
 			* The cached flag is used by both virtual and non-virtual
-- 
cgit