commit bb5dbcdfacb76216a7967463ba47e78dc32450f3
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Jul 09 16:36:47 2015 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Jul 10 16:08:11 2015 -0400
tree 5405e1a9f67be2a255c6da4bcd4ba953c704e62b
parent 87a94467a41c605db8180ef3fe627682611b033e

call: auto unhold when selecting a call

minor fix: start client with chatview collapsed

Refs #77369

Change-Id: Ic6cba78b7fece4deb8f0b644e988e64e5161b63d

src/CurrentCallVC.mm

diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index 98be9aa..443986d 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -232,6 +232,12 @@
                              [self animateOut];
                              return;
                          }
+
+                         auto call = CallModel::instance()->getCall(current);
+                         if (call->state() == Call::State::HOLD) {
+                             call << Call::Action::HOLD;
+                         }
+
                          [self collapseRightView];
                          [self updateCall];
                          [self updateAllActions];
@@ -377,6 +383,7 @@
     [self.view setFrame:self.view.superview.bounds];
     [self.view setHidden:YES];
     self.view.layer.position = self.view.frame.origin;
+    [self collapseRightView];
 }
 
 # pragma private IN/OUT animations