Skip to content

Commit

Permalink
Merge pull request #1343 from vector-im/riot_1340
Browse files Browse the repository at this point in the history
Bug Fix - Crash when hitting a room header after some special steps
  • Loading branch information
giomfo committed Jun 22, 2017
2 parents 589d7e7 + da22a8a commit ba4cf1d
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions Riot/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
<outlet property="roomTitleViewContainer" destination="djN-zB-Vni" id="VQG-Mp-hSa"/>
<segue destination="nDS-pp-sWM" kind="show" identifier="showMemberDetails" id="fNQ-S3-DbZ"/>
<segue destination="gkO-rP-nGK" kind="show" identifier="showContactDetails" id="ziz-Xl-QVg"/>
<segue destination="e7G-NU-7ck" kind="show" identifier="showRoomDetails" id="mFs-HA-7Oo"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Yjg-uP-Hcy" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down Expand Up @@ -154,7 +155,7 @@
<tableViewController id="e7G-NU-7ck" customClass="SegmentedViewController" sceneMemberID="viewController"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="fXh-hO-Zgf" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2558" y="-546"/>
<point key="canvasLocation" x="3326" y="-442"/>
</scene>
<!--People View Controller-->
<scene sceneID="Qba-PP-lco">
Expand Down Expand Up @@ -397,7 +398,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="01q-h6-40E" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3326" y="-420"/>
<point key="canvasLocation" x="5046" y="-711"/>
</scene>
<!--RoomNav-->
<scene sceneID="r7l-gg-dq7">
Expand Down Expand Up @@ -577,9 +578,10 @@
<image name="tab_rooms_selected.png" width="25" height="25"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="f5u-Y1-7nt"/>
<segue reference="cUw-vU-gJq"/>
<segue reference="tk8-vF-K4T"/>
<segue reference="Tfl-tq-LQp"/>
<segue reference="0ws-cL-0tk"/>
<segue reference="ziz-Xl-QVg"/>
<segue reference="mFs-HA-7Oo"/>
<segue reference="fNQ-S3-DbZ"/>
</inferredMetricsTieBreakers>
</document>

0 comments on commit ba4cf1d

Please sign in to comment.