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

Date:

2011-12-03 02:13:12 (12 years 4 months ago)

Author:

Rekursor

Commit:

378

Parents:

377

Message:

Fixed swapping reset problem when no pref file is present.

Changes:

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

File differences

-244
245 245
246 246
247
248
247 249
248 250
249 251
... ...
255 257
256 258
257 259
258 
259 260
260 261
261 262
+␊
␉␉}␊
␉␉␊
␉␉[PartsInfoMgr resetSwapping];␊
␊
␉␉if (BootProp::instance().isValid())␊
␉␉{␊
␉␉␉// read options in the plist file␊

␉␉␉if (s==nil) s = "";␊
␉␉␉[PartsInfoMgr renameParts: [NSString stringWithUTF8String: s]];␊
␉␉␉␊
␉␉␉[PartsInfoMgr resetSwapping];␊
␊
␉␉␉id val = [mOptionsDict valueForKey: keySwapHD01];␊
␉␉␉[[BootSetupController instance]->mSwapHD01 setIntValue:  [val intValue] ];␊
 ...
 ␊
 ␉␉}␊
 ␉␉␊
+␉␉[PartsInfoMgr resetSwapping];␊
+␊
 ␉␉if (BootProp::instance().isValid())␊
 ␉␉{␊
 ␉␉␉// read options in the plist file␊
 ␉␉␉if (s==nil) s = "";␊
 ␉␉␉[PartsInfoMgr renameParts: [NSString stringWithUTF8String: s]];␊
 ␉␉␉␊
-␉␉␉[PartsInfoMgr resetSwapping];␊
 ␊
 ␉␉␉id val = [mOptionsDict valueForKey: keySwapHD01];␊
 ␉␉␉[[BootSetupController instance]->mSwapHD01 setIntValue:  [val intValue] ];␊

-46
47 47
48 48
49 
50 49
51 50
52 51
+␊
+(NSMutableArray*)␉extractInfoWithBSDNames: (NSArray*) bsdNames;␊
+(NSMutableArray*)␉extractInfoWithBSDNames: (NSArray*) bsdNames withArray:(NSMutableArray*) arr;␊
+(NSUInteger*) ResetHdRedirTable;␊
␊
-(bool)␉isValid;␊
␊
 ␊
 +(NSMutableArray*)␉extractInfoWithBSDNames: (NSArray*) bsdNames;␊
 +(NSMutableArray*)␉extractInfoWithBSDNames: (NSArray*) bsdNames withArray:(NSMutableArray*) arr;␊
-+(NSUInteger*) ResetHdRedirTable;␊
 ␊
 -(bool)␉isValid;␊
 ␊

-132
133 133
134 134
135 
135
136 136
137 137
138 138
+//--------------------------------------------------------------------------␊
- (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 ␊
 //--------------------------------------------------------------------------␊
 - (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 ␊

-48
49 49
50 50
51 
52 
53 
54 
55 
56 51
57 52
58 53
... ...
195 190
196 191
197 192
198 
199 
200 193
201 194
202 195
+}␊
␊
/// 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␊
{␊

␉␊
␉if (partArr!=nil && [partArr count]>0)␊
␉{␊
␉␉␉[PartitionInfoElement␉ResetHdRedirTable];␊
␊
␉␉␉DASessionRef session = DASessionCreate(NULL);␊
␉␉␉for (NSString* part in partArr)␊
␉␉␉{␊
 ...
 }␊
 ␊
 /// 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␊
 {␊
 ␉␊
 ␉if (partArr!=nil && [partArr count]>0)␊
 ␉{␊
-␉␉␉[PartitionInfoElement␉ResetHdRedirTable];␊
-␊
 ␉␉␉DASessionRef session = DASessionCreate(NULL);␊
 ␉␉␉for (NSString* part in partArr)␊
 ␉␉␉{␊