From a0c06b45546bcb89b135bc17c8983f6e04ff3d32 Mon Sep 17 00:00:00 2001
From: cxgeorge <>
Date: Fri, 10 Jan 2003 22:49:13 +0000
Subject: [PATCH] fix scrollist crash for non-class lists

---
 direct/src/gui/DirectScrolledList.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/direct/src/gui/DirectScrolledList.py b/direct/src/gui/DirectScrolledList.py
index c01101e0b6..17811c6a1b 100644
--- a/direct/src/gui/DirectScrolledList.py
+++ b/direct/src/gui/DirectScrolledList.py
@@ -1,6 +1,7 @@
 from DirectFrame import *
 from DirectButton import *
 import Task
+import types
 
 class DirectScrolledList(DirectFrame):
     def __init__(self, parent = aspect2d, **kw):
@@ -104,6 +105,13 @@ class DirectScrolledList(DirectFrame):
         #for i in range(len(self["items"])):
         #    print "buttontext[",i,"]",self["items"][i]["text"]
 
+        if(len(self["items"])==0):
+            return
+
+        if(type(self["items"][0])!=types.InstanceType):
+            print "warning: getItemIndexForItemID: cant find itemID for non-class list items!"
+            return
+
         for i in range(len(self["items"])):
             if(self["items"][i].itemID == itemID):
                 return i
@@ -218,14 +226,18 @@ class DirectScrolledList(DirectFrame):
         """
         Add this string and extraArg to the list
         """
-        item.itemID = self.nextItemID
-        self.nextItemID += 1
+        if(type(item) == types.InstanceType):
+            # cant add attribs to non-classes (like strings & ints)
+            item.itemID = self.nextItemID
+            self.nextItemID += 1
         self['items'].append(item)
         if type(item) != type(''):
             item.reparentTo(self.itemFrame)
         if refresh:
             self.refresh()
-        return item.itemID  # to pass to scrollToItemID
+        if(type(item) == types.InstanceType):
+            return item.itemID  # to pass to scrollToItemID
+        return
 
     def removeItem(self, item, refresh=1):
         """