diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-03-07 10:36:50 -0500 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-03-07 10:36:50 -0500 |
| commit | ab605bfa3c1349fad004460d532ecd207a0066d6 (patch) | |
| tree | 6ca6bbe444ce6f1c2c44ae7886900cefc171f518 | |
| parent | 41b56f5f6aa3782c86af79ac8142a942ae795c0e (diff) | |
| parent | 5179d7f7a2bac9aa541f130713b461074045fb26 (diff) | |
| download | sdl_ios-ab605bfa3c1349fad004460d532ecd207a0066d6.tar.gz | |
Merge branch 'master' into develop
| -rw-r--r-- | .github/ISSUE_TEMPLATE.md | 4 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 4 | ||||
| -rw-r--r-- | SmartDeviceLink_Example/Classes/ProxyManager.m | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 9d11929f5..84c2de694 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -5,8 +5,8 @@ ##### Reproduction Steps 1. [Step 1] -1. [Step 2] -1. [Step 3] +2. [Step 2] +3. [Step 3] ##### Expected Behavior [Some expected behavior] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2b3f22d93..9a41515c7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -19,8 +19,8 @@ This PR makes **[no / minor / major]** API changes. ##### Breaking Changes * [Breaking change info] -##### Enchancements -* [Enchancement info] +##### Enhancements +* [Enhancement info] ##### Bug Fixes * [Bug Fix Info] diff --git a/SmartDeviceLink_Example/Classes/ProxyManager.m b/SmartDeviceLink_Example/Classes/ProxyManager.m index d0fef72d1..5139da20e 100644 --- a/SmartDeviceLink_Example/Classes/ProxyManager.m +++ b/SmartDeviceLink_Example/Classes/ProxyManager.m @@ -357,7 +357,7 @@ NS_ASSUME_NONNULL_BEGIN // Reset our state self.firstTimeState = SDLHMIFirstStateNone; self.initialShowState = SDLHMIInitialShowStateNone; - _state = ProxyStateStopped; + [self sdlex_updateProxyState:ProxyStateStopped]; if (ShouldRestartOnDisconnect) { [self startManager]; } |