Chameleon Applications

Chameleon Applications Commit Details

Date:2011-12-03 02:13:12 (8 years 10 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

trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm
244244
245245
246246
247
248
247249
248250
249251
......
255257
256258
257259
258
259260
260261
261262
}
[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] ];
trunk/ChameleonPrefPane/Sources/PartitionInfoElement.h
4646
4747
4848
49
5049
5150
5251
+(NSMutableArray*)extractInfoWithBSDNames: (NSArray*) bsdNames;
+(NSMutableArray*)extractInfoWithBSDNames: (NSArray*) bsdNames withArray:(NSMutableArray*) arr;
+(NSUInteger*) ResetHdRedirTable;
-(bool)isValid;
trunk/ChameleonPrefPane/Sources/BootSetupController.mm
132132
133133
134134
135
135
136136
137137
138138
//--------------------------------------------------------------------------
- (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
trunk/ChameleonPrefPane/Sources/PartitionInfoElement.mm
4848
4949
5050
51
52
53
54
55
5651
5752
5853
......
195190
196191
197192
198
199
200193
201194
202195
}
/// 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)
{
[PartitionInfoElementResetHdRedirTable];
DASessionRef session = DASessionCreate(NULL);
for (NSString* part in partArr)
{

Archive Download the corresponding diff file

Revision: 378