From 66b1174d258e4ee0b4a410f2aa3b63f1e6cf280e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Wed, 12 Jul 2017 19:52:36 +0200
Subject: [PATCH] Fix CW auto-expanding if collapsed toots are disabled

---
 app/javascript/glitch/components/status/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/glitch/components/status/index.js b/app/javascript/glitch/components/status/index.js
index a11cc0b6e9d..12ea0e9aaee 100644
--- a/app/javascript/glitch/components/status/index.js
+++ b/app/javascript/glitch/components/status/index.js
@@ -233,7 +233,9 @@ uncollapse our status accordingly.
 
   componentWillReceiveProps (nextProps) {
     if (!nextProps.settings.getIn(['collapsed', 'enabled'])) {
-      this.setExpansion(true);
+      if (this.state.isExpanded === false) {
+        this.setExpansion(null);
+      }
     } else if (
       nextProps.collapse !== this.props.collapse &&
       nextProps.collapse !== undefined