diff -r 01633f527642 -r 4fdaf2564cfd ProjectDefinition.st
--- a/ProjectDefinition.st	Thu Oct 12 10:30:20 2006 +0200
+++ b/ProjectDefinition.st	Thu Oct 12 10:51:25 2006 +0200
@@ -623,18 +623,21 @@
         ].
 
         self searchForClasses do:[:eachClass |
-            |attributes oldSpecEntry|
+            |attributes oldSpecEntry oldAttributes|
 
             oldSpecEntry := oldSpec detect:[:entry | entry = eachClass name or:[entry first = eachClass name]] ifNone:nil.
 
             (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
                 (eachClass isLoaded not or:[eachClass isPrivate not]) ifTrue:[
                     (self additionalClassNamesAndAttributes includes:eachClass name) ifFalse:[
+                        (oldSpecEntry isArray and:[oldSpecEntry size > 1]) ifTrue:[
+                            oldAttributes := oldSpecEntry copyFrom:2.
+                        ].
+
                         ignoreOldDefinition ifTrue:[
                             "take autoload attribute from classes state in the image"
-                            oldSpecEntry notNil ifTrue:[
-                                attributes := oldSpecEntry copyFrom:2.
-                                attributes := attributes copyWithout:#autoload.
+                            oldAttributes notNil ifTrue:[
+                                attributes := oldAttributes copyWithout:#autoload.
                             ] ifFalse:[
                                 attributes := #()
                             ].
@@ -643,8 +646,8 @@
                             ].
                         ] ifFalse:[
                             "keep any existing attribute"
-                            oldSpecEntry notNil ifTrue:[
-                                attributes := oldSpecEntry copyFrom:2.
+                            oldAttributes notNil ifTrue:[
+                                attributes := oldAttributes.
                             ] ifFalse:[
                                 attributes := eachClass isLoaded ifTrue:[ #() ] ifFalse:[ #(autoload) ].
                             ].
@@ -3342,7 +3345,7 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.94 2006-10-11 12:34:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.95 2006-10-12 08:51:25 mb Exp $'
 ! !
 
 ProjectDefinition initialize!