--- a/MCPackageLoader.st	Sat Aug 20 19:08:24 2011 +0200
+++ b/MCPackageLoader.st	Sat Aug 20 19:45:39 2011 +0200
@@ -277,40 +277,45 @@
         confirmedChanges := Tools::ChangeSetBrowser2
                     confirmChanges: changes
                     label:'Overridden definitions. Load anyway?'.
-        confirmedChanges := confirmedChanges flatten.
-        definitions := confirmedChanges collect:[:e|e mcDefinition].
-        self assert:(definitions includes:nil) not.
-        self tryToLoadAll: definitions label: 'Loading overrides...'.
+        confirmedChanges notEmpty ifTrue:[
+            confirmedChanges := confirmedChanges flatten.
+            definitions := confirmedChanges collect:[:e|e mcDefinition].
+            self assert:(definitions includes:nil) not.
+            self tryToLoadAll: definitions label: 'Loading overrides...'.
+        ]
     ] else:[
         self tryToLoadAll: overrideDefinitions label: 'Loading overrides...'.
     ]
 
     "Created: / 08-11-2010 / 20:19:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 06-03-2011 / 20:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 20-08-2011 / 18:55:08 / cg"
+    "Modified: / 20-08-2011 / 19:31:40 / cg"
 !
 
 warnAboutUnloadables
 
-    | changes definitions |
+    | changes confirmedChanges definitions |
 
     unloadableDefinitions isNilOrEmptyCollection ifTrue:[^self].
     self ifInteractive:[
         changes := ChangeSet withAll:(unloadableDefinitions collect:[:e|e asChange]).
         self assert:(changes includes:nil) not.
-        changes := Tools::ChangeSetBrowser2
+        confirmedChanges := Tools::ChangeSetBrowser2
                     confirmChanges: changes
                     label:'Unsatisfied dependencies. Load anyway?'.
-        definitions := changes collect:[:e|e mcDefinition].
-        self assert:(definitions includes:nil) not.
-        self tryToLoadAll: definitions label: 'Loading unloadables...'.
+        confirmedChanges notEmpty ifTrue:[
+            confirmedChanges := confirmedChanges flatten.
+            definitions := confirmedChanges collect:[:e|e mcDefinition].
+            self assert:(definitions includes:nil) not.
+            self tryToLoadAll: definitions label: 'Loading unloadables...'.
+        ]
     ] else:[
         self tryToLoadAll: unloadableDefinitions label: 'Loading unloadables...'.
     ]
 
     "Created: / 08-11-2010 / 20:19:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 06-03-2011 / 20:36:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 20-08-2011 / 18:39:26 / cg"
+    "Modified: / 20-08-2011 / 19:31:22 / cg"
 ! !
 
 !MCPackageLoader methodsFor:'public'!
@@ -358,11 +363,11 @@
 !MCPackageLoader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCPackageLoader.st,v 1.5 2011-08-20 17:06:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCPackageLoader.st,v 1.6 2011-08-20 17:45:39 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCPackageLoader.st,v 1.5 2011-08-20 17:06:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCPackageLoader.st,v 1.6 2011-08-20 17:45:39 cg Exp $'
 !
 
 version_SVN