From 46572ae793425ea3c778195693fee0bc8d4897b2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 12 Apr 2016 02:27:35 +0100
Subject: [PATCH] click on group call thumbnail should return you to the group
 call, not the 1:1

---
 src/VectorConferenceHandler.js         | 1 +
 src/components/structures/LeftPanel.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index aa88e77fa..f34a7b732 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -44,6 +44,7 @@ ConferenceCall.prototype.setup = function() {
         // looking for a 1:1 room with this conf user ID!)
         var call = Matrix.createNewMatrixCall(self.client, room.roomId);
         call.confUserId = self.confUserId;
+        call.groupRoomId = self.groupRoomId;
         return call;
     });
 };
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 7115685f1..0e13f39e4 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -79,7 +79,7 @@ var LeftPanel = React.createClass({
         if (call) {
             dis.dispatch({
                 action: 'view_room',
-                room_id: call.roomId,
+                room_id: call.groupRoomId || call.roomId,
             });
         }
     },