Commit 3b705163 authored by David Fuhrmann's avatar David Fuhrmann

macosx: audio effects: fix behaviour of cancel button in organize profile dialog box

parent 24b9a215
...@@ -719,8 +719,8 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf, ...@@ -719,8 +719,8 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item - (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 */ /* remove requested profile from the arrays */
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSMutableArray *workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:@"EQValues"]]; NSMutableArray *workArray = [[NSMutableArray alloc] initWithArray:[defaults objectForKey:@"EQValues"]];
...@@ -740,28 +740,34 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf, ...@@ -740,28 +740,34 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
[defaults setObject:[NSArray arrayWithArray:workArray] forKey:@"EQNames"]; [defaults setObject:[NSArray arrayWithArray:workArray] forKey:@"EQNames"];
[workArray release]; [workArray release];
[defaults synchronize]; [defaults synchronize];
}
/* update UI */ /* update UI */
[self updatePresetSelector]; [self updatePresetSelector];
} else { } 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"];
/* save defaults */ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
[defaults synchronize]; if (value != NSOKButton) {
[self resetProfileSelector]; [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];
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment