class: NewLauncher
authorClaus Gittinger <cg@exept.de>
Thu, 04 Dec 2014 20:57:37 +0100
changeset 14996 8770d975607c
parent 14995 9dc92bd11831
child 14997 df3528dd1c58
class: NewLauncher changed: #fileLoadPackage
NewLauncher.st
--- a/NewLauncher.st	Thu Dec 04 18:39:44 2014 +0100
+++ b/NewLauncher.st	Thu Dec 04 20:57:37 2014 +0100
@@ -4992,7 +4992,7 @@
             packageID := path first , ':' , ((path copyFrom:2) asStringWith:$/).
             item := getItemByPath value:path.
             "/ do not overwrite an app by a lib with the same name (happens in expecco/application)
-            (isApplication or:[ item icon isNil ]) ifTrue:[
+            (isApplication or:[ item icon isNil or:[item icon == folderIcon]]) ifTrue:[
                 (ProjectDefinition definitionClassForPackage:packageID) isNil ifTrue:[
                     "/ not currently loaded
                     item icon:(isApplication ifTrue:[applicationIcon] ifFalse:[packageIcon]). 
@@ -5290,14 +5290,14 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.509 2014-12-02 00:05:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.510 2014-12-04 19:57:37 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.509 2014-12-02 00:05:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.510 2014-12-04 19:57:37 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: NewLauncher.st,v 1.509 2014-12-02 00:05:19 cg Exp $'
+    ^ '$Id: NewLauncher.st,v 1.510 2014-12-04 19:57:37 cg Exp $'
 ! !