Index: trunk/ChameleonPrefPane/Sources/PartitionInfoManager.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoManager.mm	(revision 359)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoManager.mm	(revision 360)
@@ -74,7 +74,7 @@
 {
 	if (sParts==nil)
 	{
-		[PartsInfoMgr resetSwapping]; 
+		//[PartsInfoMgr resetSwapping]; 
 		NSArray* partArr = [PartitionInfoElement createBSDPartitionList];
 		sParts = (NSMutableArray*) [PartitionInfoElement extractInfoWithBSDNames: partArr withArray: nil];
 		[partArr release];
Index: trunk/ChameleonPrefPane/Sources/BootSetupController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 359)
+++ trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 360)
@@ -131,16 +131,16 @@
 - (void) swapDisks: (bool) bSwap src: (int) iSrc dst: (int) iDst;
 {
 	if(!BootProp::instance().isValid()) return;
+	if ([mFreezeParts intValue]==0) 
+		[PartsInfoMgr reload];
+	else 
+		[self loadFrozenParts ];
+	
 	if (bSwap)
 	{
 		[PartsInfoMgr swapHD:iSrc with: iDst ];	
 	}
 	
-	if ([mFreezeParts intValue]==0) 
-		[PartsInfoMgr reload];
-	else 
-		[self loadFrozenParts ];
-	
 	[ [self chameleon] selectDefaultPartition];
 	
 }
Index: trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 359)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 360)
@@ -62,7 +62,7 @@
 
 -(NSString*) hdString
 {
-	return [NSString stringWithFormat:@"hd(%d,%d)", diskNum, partNum];
+	return [NSString stringWithFormat:@"hd(%d,%d)", [self diskNumber], [self partitionNumber]];
 }
 
 -(void) setDiskNumber: (int) d