MacGUI: Update main window preset control when renaming via popover.

diff --git a/macosx/English.lproj/Presets.xib b/macosx/English.lproj/Presets.xib
index 6dde03dae05e24e1b3845560081ea18a72b17e7a..7487802b07e8a0475454aa10f305303a1864e89b 100644 (file)
--- a/macosx/English.lproj/Presets.xib
+++ b/macosx/English.lproj/Presets.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13770" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13770"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -61,6 +61,9 @@ Overrides all encode settings. Settings may be further adjusted after selecting
                                                             <font key="font" metaFont="smallSystem"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                                            <connections>
+                                                                <action selector="renamed:" target="-2" id="ZKl-KQ-seA"/>
+                                                            </connections>
                                                         </textFieldCell>
                                                         <connections>
                                                             <binding destination="czB-kB-CXf" name="editable" keyPath="objectValue.isBuiltIn" id="ynB-cm-NHg">

diff --git a/macosx/HBController.m b/macosx/HBController.m
index 5a7f1ce37c4afa09843b392c48347516e8266b4e..94ab5630650ab4454d52df226cc12104212e9693 100644 (file)
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -1367,10 +1367,7 @@
 
 - (void)selectionDidChange
 {
-    if (fPresetsView.selectedPreset != self.currentPreset || self.edited)
-    {
-        [self applyPreset:fPresetsView.selectedPreset];
-    }
+    [self applyPreset:fPresetsView.selectedPreset];
 }
 
 #pragma mark -  Presets

diff --git a/macosx/HBPresetsViewController.m b/macosx/HBPresetsViewController.m
index 2e44985f6078f79589b0099ad969b6fa35bf9c32..4e52ad1a9cc5aa59e8072a6fc57257372f78f5c6 100644 (file)
--- a/macosx/HBPresetsViewController.m
+++ b/macosx/HBPresetsViewController.m
@@ -249,6 +249,15 @@ static void *HBPresetsViewControllerContext = &HBPresetsViewControllerContext;
     }
 }
 
+- (IBAction)renamed:(id)sender
+{
+    if (self.delegate && [[self.treeController.selectedObjects firstObject] isLeaf])
+    {
+        [self.delegate selectionDidChange];
+        [[NSNotificationCenter defaultCenter] postNotificationName:HBPresetsChangedNotification object:nil];
+    }
+}
+
 - (IBAction)addNewPreset:(id)sender
 {
     if (self.delegate)