Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm	(revision 377)
+++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm	(revision 378)
@@ -244,6 +244,8 @@
 
 		}
 		
+		[PartsInfoMgr resetSwapping];
+
 		if (BootProp::instance().isValid())
 		{
 			// read options in the plist file
@@ -255,7 +257,6 @@
 			if (s==nil) s = "";
 			[PartsInfoMgr renameParts: [NSString stringWithUTF8String: s]];
 			
-			[PartsInfoMgr resetSwapping];
 
 			id val = [mOptionsDict valueForKey: keySwapHD01];
 			[[BootSetupController instance]->mSwapHD01 setIntValue:  [val intValue] ];
Index: trunk/ChameleonPrefPane/Sources/PartitionInfoElement.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoElement.h	(revision 377)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoElement.h	(revision 378)
@@ -46,7 +46,6 @@
 
 +(NSMutableArray*)	extractInfoWithBSDNames: (NSArray*) bsdNames;
 +(NSMutableArray*)	extractInfoWithBSDNames: (NSArray*) bsdNames withArray:(NSMutableArray*) arr;
-+(NSUInteger*) ResetHdRedirTable;
 
 -(bool)	isValid;
 
Index: trunk/ChameleonPrefPane/Sources/BootSetupController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 377)
+++ trunk/ChameleonPrefPane/Sources/BootSetupController.mm	(revision 378)
@@ -132,7 +132,7 @@
 //--------------------------------------------------------------------------
 - (void) swapDisks: (bool) bSwap src: (int) iSrc dst: (int) iDst;
 {
-	if(!BootProp::instance().isValid()) return;
+	//if(!BootProp::instance().isValid()) return;
 	if ([mFreezeParts intValue]==0) 
 		[PartsInfoMgr reload];
 	else 
Index: trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 377)
+++ trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm	(revision 378)
@@ -48,11 +48,6 @@
 }
 
 /// redirection table for disk swapping
-+(NSUInteger*) ResetHdRedirTable
-{
-	for (int i=0; i< MAX_HD; i++) sHdRedirTable[i]=i;
-}
-
 /// extract disk number from bsdname spec
 -(int) diskNumber
 {
@@ -195,8 +190,6 @@
 	
 	if (partArr!=nil && [partArr count]>0)
 	{
-			[PartitionInfoElement	ResetHdRedirTable];
-
 			DASessionRef session = DASessionCreate(NULL);
 			for (NSString* part in partArr)
 			{