vlc | branch: master | David Fuhrmann <[email protected]> | Sun Jun 8 14:06:39 2014 +0200| [3b705163016cf7fd20f1a7014ebba2aa1bb0727b] | committer: David Fuhrmann
macosx: audio effects: fix behaviour of cancel button in organize profile dialog box > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b705163016cf7fd20f1a7014ebba2aa1bb0727b --- modules/gui/macosx/AudioEffects.m | 48 +++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m index ea887b0..7e24daf 100644 --- a/modules/gui/macosx/AudioEffects.m +++ b/modules/gui/macosx/AudioEffects.m @@ -719,8 +719,8 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf, - (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item { - if (value == NSOKButton) { - if (!b_genericAudioProfileInInteraction) { + if (!b_genericAudioProfileInInteraction) { + if (value == NSOKButton) { /* remove requested profile from the arrays */ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSMutableArray *workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:@"EQValues"]]; @@ -740,28 +740,34 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf, [defaults setObject:[NSArray arrayWithArray:workArray] forKey:@"EQNames"]; [workArray release]; [defaults synchronize]; + } - /* update UI */ - [self updatePresetSelector]; - } else { - /* remove selected profile from settings */ - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSMutableArray *workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:@"AudioEffectProfiles"]]; - [workArray removeObjectAtIndex:item]; - [defaults setObject:[NSArray arrayWithArray:workArray] forKey:@"AudioEffectProfiles"]; - [workArray release]; - workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:@"AudioEffectProfileNames"]]; - [workArray removeObjectAtIndex:item]; - [defaults setObject:[NSArray arrayWithArray:workArray] forKey:@"AudioEffectProfileNames"]; - [workArray release]; - - if (i_old_profile_index >= item) - [defaults setInteger:i_old_profile_index - 1 forKey:@"AudioEffectSelectedProfile"]; + /* update UI */ + [self updatePresetSelector]; + } else { - /* save defaults */ - [defaults synchronize]; - [self resetProfileSelector]; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + if (value != NSOKButton) { + [o_profile_pop selectItemAtIndex:[defaults integerForKey:@"AudioEffectSelectedProfile"]]; + return; } + + /* remove selected profile from settings */ + NSMutableArray *workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:@"AudioEffectProfiles"]]; + [workArray removeObjectAtIndex:item]; + [defaults setObject:[NSArray arrayWithArray:workArray] forKey:@"AudioEffectProfiles"]; + [workArray release]; + workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:@"AudioEffectProfileNames"]]; + [workArray removeObjectAtIndex:item]; + [defaults setObject:[NSArray arrayWithArray:workArray] forKey:@"AudioEffectProfileNames"]; + [workArray release]; + + if (i_old_profile_index >= item) + [defaults setInteger:i_old_profile_index - 1 forKey:@"AudioEffectSelectedProfile"]; + + /* save defaults */ + [defaults synchronize]; + [self resetProfileSelector]; } } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
