From 0b38bf5e7b1cd783c0bbf5dc045fe1e4f0f2681c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 11 Dec 2017 17:24:33 +0000
Subject: [PATCH] Do not allow ordering until TagOrderStore has loaded

---
 src/stores/TagOrderStore.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 108eb434a2..cc1ce8625e 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -74,7 +74,11 @@ class TagOrderStore extends Store {
             break;
             // Puts payload.tag at payload.targetTag, placing the targetTag before or after the tag
             case 'order_tag': {
-                if (!payload.tag || !payload.targetTag || payload.tag === payload.targetTag) return;
+                if (!this._state.orderedTags ||
+                    !payload.tag ||
+                    !payload.targetTag ||
+                    payload.tag === payload.targetTag
+                ) return;
 
                 const tags = this._state.orderedTags;