Skip to content
Snippets Groups Projects
Commit 5df2f626 authored by George Nachman's avatar George Nachman
Browse files

Fix a crash when you press the delete button in the triggers panel and no trigger is selected.

parent 6f6a158d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Interfaces/PreferencePanel.xib
+ 8
− 7
View file @ 5df2f626
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment version="1070" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
@@ -62,6 +62,7 @@
<outlet property="_parametersColumn" destination="5816" id="dWA-sr-82N"/>
<outlet property="_partialLineColumn" destination="4jW-vz-58j" id="8Cg-Bd-xs2"/>
<outlet property="_regexColumn" destination="5785" id="XSz-99-6Uu"/>
<outlet property="_removeTriggerButton" destination="5792" id="OfR-WY-r2B"/>
<outlet property="_tableView" destination="5783" id="vJV-I5-Q3Z"/>
<outlet property="delegate" destination="Qvt-kg-svI" id="M21-fa-c7S"/>
<outlet property="window" destination="5904" id="5919"/>
@@ -121,7 +122,7 @@
<outlet property="window" destination="6274" id="6311"/>
</connections>
</customObject>
<window title="Edit Pointer Setting" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="6179" customClass="NSPanel">
<window title="Edit Pointer Setting" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="6179" userLabel="Edit Smart Selection Actions Panel" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES" utility="YES" documentModal="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="132" width="451" height="246"/>
@@ -906,7 +907,7 @@ Gw
<rect key="frame" x="43" y="20" width="24" height="24"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<animations/>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSRemoveTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5793">
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSRemoveTemplate" imagePosition="only" alignment="center" enabled="NO" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5793">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
@@ -977,7 +978,7 @@ DQ
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="5844" id="5845">
<rect key="frame" x="0.0" y="0.0" width="763" height="19"/>
<rect key="frame" x="0.0" y="0.0" width="763" height="247"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
@@ -1211,7 +1212,7 @@ DQ
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" headerView="6284" id="6283">
<rect key="frame" x="0.0" y="0.0" width="533" height="19"/>
<rect key="frame" x="0.0" y="0.0" width="533" height="136"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
@@ -5619,7 +5620,7 @@ DQ
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" headerView="5563" id="5562">
<rect key="frame" x="0.0" y="0.0" width="238" height="19"/>
<rect key="frame" x="0.0" y="0.0" width="238" height="361"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
@@ -5747,7 +5748,7 @@ DQ
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" headerView="6206" id="6091">
<rect key="frame" x="0.0" y="0.0" width="849" height="19"/>
<rect key="frame" x="0.0" y="0.0" width="849" height="228"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
sources/TriggerController.m
+ 4
− 0
View file @ 5df2f626
@@ -72,6 +72,7 @@ static NSString *const kBackgroundColorWellIdentifier = @"kBackgroundColorWellId
IBOutlet NSTableColumn *_partialLineColumn;
IBOutlet NSTableColumn *_actionColumn;
IBOutlet NSTableColumn *_parametersColumn;
IBOutlet NSButton *_removeTriggerButton;
}
 
- (instancetype)init {
@@ -231,6 +232,8 @@ static NSString *const kBackgroundColorWellIdentifier = @"kBackgroundColorWellId
- (IBAction)removeTrigger:(id)sender {
assert(_tableView.selectedRow >= 0);
[self setTriggerDictionary:nil forRow:[_tableView selectedRow] reloadData:YES];
self.hasSelection = [_tableView numberOfSelectedRows] > 0;
_removeTriggerButton.enabled = self.hasSelection;
}
 
- (void)setGuid:(NSString *)guid {
@@ -495,6 +498,7 @@ static NSString *const kBackgroundColorWellIdentifier = @"kBackgroundColorWellId
 
- (void)tableViewSelectionDidChange:(NSNotification *)notification {
self.hasSelection = [_tableView numberOfSelectedRows] > 0;
_removeTriggerButton.enabled = self.hasSelection;
}
 
#pragma mark NSWindowDelegate
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