Chameleon Applications Commit Details - 360 - Chameleon related Applications (system preferences panels, helper applications)

Date:

2011-11-19 22:00:47 (12 years 5 months ago)

Author:

Rekursor

Commit:

360

Parents:

359

Message:

more swapping bug fixes

Changes:

M	/trunk/ChameleonPrefPane/Sources/BootSetupController.mm
M	/trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm
M	/trunk/ChameleonPrefPane/Sources/PartitionInfoManager.mm

File differences

-74
75 75
76 76
77 
77
78 78
79 79
80 80
+{␊
␉if (sParts==nil)␊
␉{␊
␉␉[PartsInfoMgr resetSwapping]; ␊
␉␉//[PartsInfoMgr resetSwapping]; ␊
␉␉NSArray* partArr = [PartitionInfoElement createBSDPartitionList];␊
␉␉sParts = (NSMutableArray*) [PartitionInfoElement extractInfoWithBSDNames: partArr withArray: nil];␊
␉␉[partArr release];␊
 {␊
 ␉if (sParts==nil)␊
 ␉{␊
-␉␉[PartsInfoMgr resetSwapping]; ␊
+␉␉//[PartsInfoMgr resetSwapping]; ␊
 ␉␉NSArray* partArr = [PartitionInfoElement createBSDPartitionList];␊
 ␉␉sParts = (NSMutableArray*) [PartitionInfoElement extractInfoWithBSDNames: partArr withArray: nil];␊
 ␉␉[partArr release];␊

-131
132 132
133 133
134
135
136
137
138
134 139
135 140
136 141
137 142
138 143
139 
140 
141 
142 
143 
144 144
145 145
146 146
+- (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];␊
␉␊
}␊
 - (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];␊
 ␉␊
 }␊

-62
63 63
64 64
65 
65
66 66
67 67
68 68
+␊
-(NSString*) hdString␊
{␊
␉return [NSString stringWithFormat:@"hd(%d,%d)", diskNum, partNum];␊
␉return [NSString stringWithFormat:@"hd(%d,%d)", [self diskNumber], [self partitionNumber]];␊
}␊
␊
-(void) setDiskNumber: (int) d␊
 ␊
 -(NSString*) hdString␊
 {␊
-␉return [NSString stringWithFormat:@"hd(%d,%d)", diskNum, partNum];␊
+␉return [NSString stringWithFormat:@"hd(%d,%d)", [self diskNumber], [self partitionNumber]];␊
 }␊
 ␊
 -(void) setDiskNumber: (int) d␊