From a0a609e8afad550be86bf47828315d727214026f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 6 Sep 2014 17:48:16 -0700
Subject: fix embarassing bug where in-progress messages get vaped when the
 previous one gets delivered

---
 webclient/room/room-controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'webclient')

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index c702917fef..c8ca771b25 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -485,7 +485,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
             promise.then(
                 function() {
                     console.log("Request successfully sent");
-                    $scope.textInput = "";
+                    if (!echo) {
+                        $scope.textInput = "";
+                    }
 /*
                     if (echoMessage) {
                         // Remove the fake echo message from the room messages
-- 
cgit 1.4.1