ecere/gui/Window, ListBox: Fixed lockups related to clickThrough, crashes related...

[sdk] / ecere / src / gui / controls / ListBox.ec

diff --git a/ecere/src/gui/controls/ListBox.ec b/ecere/src/gui/controls/ListBox.ec
index 5bcec46..6f609dd 100644 (file)
--- a/ecere/src/gui/controls/ListBox.ec
+++ b/ecere/src/gui/controls/ListBox.ec
@@ -808,7 +808,7 @@ private:
          {
             DataField field;
             for(field = listBox.fields.first; field && field.index != cellIndex; field = field.next);
-            if(field.dataType)
+            if(field && field.dataType)
             {
                // TOCHECK: Is this check good? Will need incref/decref sometime?
                if(field.dataType.type == normalClass || field.dataType.type == noHeadClass)
@@ -1208,9 +1208,9 @@ public:
       if(this)
       {
          DataField field;
+         Clear();    // Ensure data is cleared first
          while((field = fields.first))
          {
-            //delete field;
             field.Free();
             delete field;
          }