diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2018-05-29 13:57:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 13:57:01 -0400 |
| commit | caadfdc9285290c52e4f07347afb379b6378cda0 (patch) | |
| tree | bdc8642919385b938d77910a606abd60ff69f6be | |
| parent | 79cea5752557aef0ae33be60b4d804a6cc8c8d88 (diff) | |
| parent | 81bb8ff873fb8c5fa6b55abd52a00b9e1d4f13df (diff) | |
| download | sdl_ios-caadfdc9285290c52e4f07347afb379b6378cda0.tar.gz | |
Merge pull request #982 from smartdevicelink/bug/issue_981_example_apps_crash
Fixed Swift and Obj-C example apps crashing
4 files changed, 6 insertions, 12 deletions
diff --git a/SmartDeviceLink_Example/Base.lproj/ConnectionTCPTableViewController.storyboard b/SmartDeviceLink_Example/Base.lproj/ConnectionTCPTableViewController.storyboard index d72ed86c3..2eca0e73a 100644 --- a/SmartDeviceLink_Example/Base.lproj/ConnectionTCPTableViewController.storyboard +++ b/SmartDeviceLink_Example/Base.lproj/ConnectionTCPTableViewController.storyboard @@ -114,9 +114,6 @@ <segment title="TCP Debug"/> <segment title="iAP"/> </segments> - <connections> - <action selector="connectionTypeSegmentedControlDidChange:" destination="l5Q-ZP-1BO" eventType="valueChanged" id="uaO-bf-NQR"/> - </connections> </segmentedControl> </navigationItem> <connections> diff --git a/SmartDeviceLink_Example/Base.lproj/Main.storyboard b/SmartDeviceLink_Example/Base.lproj/Main.storyboard index 848eb40ab..34ff3123e 100644 --- a/SmartDeviceLink_Example/Base.lproj/Main.storyboard +++ b/SmartDeviceLink_Example/Base.lproj/Main.storyboard @@ -50,12 +50,12 @@ <segment title="iAP"/> </segments> <connections> - <action selector="connectionTypeSegmentedControlSelectedIndexDidChange:" destination="cXb-Co-0MA" eventType="valueChanged" id="fz7-Gt-LEm"/> + <action selector="connectionTypeSegmentedControlSelectedIndexDidChange:" destination="cXb-Co-0MA" eventType="valueChanged" id="i3j-Ux-1be"/> </connections> </segmentedControl> </navigationItem> <connections> - <outlet property="connectionTypeSegmentedControl" destination="RYa-fE-Qek" id="hrn-uk-yhG"/> + <outlet property="connectionTypeSegmentedControl" destination="RYa-fE-Qek" id="uda-9c-u0v"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="ETn-uq-A6g" userLabel="First Responder" sceneMemberID="firstResponder"/> diff --git a/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard b/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard index 84f74c3b1..fc112572c 100644 --- a/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard +++ b/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard @@ -13,7 +13,7 @@ <!--ConnectionTCP Table View Controller--> <scene sceneID="geJ-kX-PTm"> <objects> - <tableViewController storyboardIdentifier="ConnectionTCPTableViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="l5Q-ZP-1BO" customClass="ConnectionTCPTableViewController" customModule="SmartDeviceLink_Example_Swift" customModuleProvider="target" sceneMemberID="viewController"> + <tableViewController storyboardIdentifier="ConnectionTCPTableViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="l5Q-ZP-1BO" customClass="ConnectionTCPTableViewController" customModule="SDL_Example" customModuleProvider="target" sceneMemberID="viewController"> <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="7ZH-AV-Zyf"> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -114,9 +114,6 @@ <segment title="TCP Debug"/> <segment title="iAP"/> </segments> - <connections> - <action selector="connectionTypeSegmentedControlDidChange:" destination="l5Q-ZP-1BO" eventType="valueChanged" id="uaO-bf-NQR"/> - </connections> </segmentedControl> </navigationItem> <connections> diff --git a/SmartDeviceLink_Example/Main.storyboard b/SmartDeviceLink_Example/Main.storyboard index 0bb92be82..81cd0bdcf 100644 --- a/SmartDeviceLink_Example/Main.storyboard +++ b/SmartDeviceLink_Example/Main.storyboard @@ -30,7 +30,7 @@ <!--Connection Container View Controller--> <scene sceneID="vG9-Hv-OW2"> <objects> - <viewController id="cXb-Co-0MA" customClass="ConnectionContainerViewController" customModule="SmartDeviceLink_Example_Swift" customModuleProvider="target" sceneMemberID="viewController"> + <viewController id="cXb-Co-0MA" customClass="ConnectionContainerViewController" customModule="SDL_Example" customModuleProvider="target" sceneMemberID="viewController"> <layoutGuides> <viewControllerLayoutGuide type="top" id="bfp-O0-sxl"/> <viewControllerLayoutGuide type="bottom" id="fet-m3-F1O"/> @@ -50,12 +50,12 @@ <segment title="iAP"/> </segments> <connections> - <action selector="indexChanged:" destination="cXb-Co-0MA" eventType="valueChanged" id="mRP-MF-F8c"/> + <action selector="indexChanged:" destination="cXb-Co-0MA" eventType="valueChanged" id="VKA-yi-yYw"/> </connections> </segmentedControl> </navigationItem> <connections> - <outlet property="segmentedControl" destination="RYa-fE-Qek" id="Ude-uG-TAL"/> + <outlet property="segmentedControl" destination="RYa-fE-Qek" id="w1s-Cm-qxn"/> </connections> </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="ETn-uq-A6g" userLabel="First Responder" sceneMemberID="firstResponder"/> |