From 3f13c56fb95109871d537995ff54f02ada677f33 Mon Sep 17 00:00:00 2001
From: Gene S <or.else@gmail.com>
Date: Fri, 9 Sep 2016 18:14:52 -0700
Subject: [PATCH] merging changes

---
 index.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 25a7b93f..1502b3b7 100644
--- a/index.html
+++ b/index.html
@@ -764,7 +764,11 @@
         var fnd = Tinode.getFndTopic();
         fnd.onSubsUpdated = this.fndSubsUpdated;
         fnd.onMetaDesc = this.fndMetaDesc;
-        fnd.subscribe({get: {sub: {}, desc: {}}});
+        if (fnd.isSubscribed()) {
+          this.setState({searchQuery: fnd.private.toString()});
+        } else {
+          fnd.subscribe({get: {sub: {}, desc: {}}});
+        }
       },
       componentWillUnmount: function() {
         var fnd = Tinode.getFndTopic();
@@ -875,7 +879,7 @@
     NewTopicView.SearchContacts = React.createClass({
       getInitialState: function() {
         return {
-          search: ''
+          search: this.props.searchQuery
         };
       },
       componentWillReceiveProps: function(nextProps) {