From a10f0a32672c8d011ae8a4f36bfd3f15329b0eee Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 18 Dec 2018 15:33:45 +0100
Subject: [PATCH] don't open right panel when switching room again

a view_right_panel_phase is dispatched by RoomHeaderButtons
on view_room, which was triggering this to show the panel again.

Check the fromHeader flag just like when hiding the panel so
only room header buttons can hide or show the right panel
---
 src/components/views/right_panel/HeaderButtons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index 4ba0148652..18ec2bd941 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -59,7 +59,7 @@ export default class HeaderButtons extends React.Component {
                     phase: null,
                 });
             } else {
-                if (this.props.collapsedRhs) {
+                if (this.props.collapsedRhs && payload.fromHeader) {
                     dis.dispatch({
                         action: 'show_right_panel',
                     });