Index: trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 56) +++ trunk/ChameleonPrefPane/Sources/ChameleonPrefPane.mm (revision 57) @@ -30,7 +30,7 @@ static const char* const szPropFileName = "com.apple.Boot.plist"; -static const int CurrentPreferencesFileVersion = 0x01; // for future back compatibility +static const int CurrentPreferencesFileVersion = 0x02; // for future back compatibility //-------------------------------------------------------------------------- // Static file variables //-------------------------------------------------------------------------- Index: trunk/ChameleonPrefPane/Sources/BootFlagsController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/BootFlagsController.mm (revision 56) +++ trunk/ChameleonPrefPane/Sources/BootFlagsController.mm (revision 57) @@ -39,7 +39,7 @@ } //-------------------------------------------------------------------------- --(void) setDefaultsValues: (NSMutableDictionary*) dict +-(void) setDefaultsValues: (NSMutableDictionary*) dict { } //-------------------------------------------------------------------------- Index: trunk/ChameleonPrefPane/Sources/BootSetupController.mm =================================================================== --- trunk/ChameleonPrefPane/Sources/BootSetupController.mm (revision 56) +++ trunk/ChameleonPrefPane/Sources/BootSetupController.mm (revision 57) @@ -50,7 +50,6 @@ [dict setObject:[[NSNumber alloc] initWithBool: false] forKey: keyUseFrozenParts]; [dict setObject:[[NSString alloc] initWithString: @""] forKey: keyForceBootConfigPath]; } - //-------------------------------------------------------------------------- -(void) loadOptionsFromPreferencesFile: (NSMutableDictionary*) dict { @@ -58,7 +57,8 @@ [mSwapHD02 setIntValue: [[dict objectForKey: keySwapHD02] intValue]]; [mFreezeParts setIntValue: [[dict objectForKey: keyUseFrozenParts] intValue] ]; id obj = [dict objectForKey: keyForceBootConfigPath]; - [mBootConfigPathText setStringValue: obj ]; + if(obj) [mBootConfigPathText setStringValue: obj ]; + else [dict setObject:[[NSString alloc] initWithString: @""] forKey: keyForceBootConfigPath]; int val = ([[mBootConfigPathText stringValue] length] >0 ? 1 : 0); [mBootConfigPath setIntValue: val]; Index: trunk/ChameleonPrefPane/Sources/PropertyList.cpp =================================================================== --- trunk/ChameleonPrefPane/Sources/PropertyList.cpp (revision 56) +++ trunk/ChameleonPrefPane/Sources/PropertyList.cpp (revision 57) @@ -100,7 +100,8 @@ } //-------------------------------------------------------------------------- -// Execute a priviledge shell command +// Execute a priviledge shell command : will wait for execution termination +// by calling wait() //-------------------------------------------------------------------------- bool executePrivilegedCmd(AuthorizationRef auth, const char* pathToTool, @@ -113,9 +114,12 @@ // Execute Cmd OSStatus status = AuthorizationExecuteWithPrivileges(auth, pathToTool,flags, (char**)argv, NULL); - - - // Cleanup mem + // Wait for the child process of AEWP to terminate: + int wait_status=0; + /* pid_t pid = */ + wait(&wait_status); + // usleep(10000); // 10 ms + // Cleanup mem for (int i=0; argv[i]; i++) free ((void*) argv[i]); return status ? false : true; Index: trunk/ChameleonPrefPane/bin/OSX105/Chameleon.prefPane.zip =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/bin/OSX106/Chameleon.prefPane.zip =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: trunk/ChameleonPrefPane/bin/version =================================================================== --- trunk/ChameleonPrefPane/bin/version (revision 56) +++ trunk/ChameleonPrefPane/bin/version (revision 57) @@ -1 +1 @@ -2.0.b2 +2.0.b3 Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib =================================================================== --- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 56) +++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib (revision 57) @@ -85,7 +85,7 @@ 72482368 138544128 - Version 2.0 b2 + Version 2.0 b3 LucidaGrande 11