From 9495a411cbe4145337a332656e52640767fa309f Mon Sep 17 00:00:00 2001
From: Diadlo <polsha3@gmail.com>
Date: Wed, 2 Aug 2017 23:38:05 +0300
Subject: [PATCH] refactor(group): Move UI code out of Group::setName

---
 src/model/group.cpp   |  5 -----
 src/widget/widget.cpp | 11 +++++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/model/group.cpp b/src/model/group.cpp
index e21df5087..207bbe869 100644
--- a/src/model/group.cpp
+++ b/src/model/group.cpp
@@ -70,11 +70,6 @@ void Group::updatePeer(int peerId, QString name)
 
 void Group::setName(const QString& name)
 {
-    chatForm->setName(name);
-
-    if (widget->isActive())
-        GUI::setWindowTitle(name);
-
     emit titleChanged(this->getGroupWidget());
 }
 
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index ed59eb7f1..6272335c0 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1737,10 +1737,17 @@ void Widget::onGroupTitleChanged(int groupnumber, const QString& author, const Q
         g->getChatForm()->addSystemInfoMessage(message, ChatMessage::INFO, curTime);
     }
 
-    contactListWidget->renameGroupWidget(g->getGroupWidget(), title);
+    GroupWidget* widget = g->getGroupWidget();
+    contactListWidget->renameGroupWidget(widget, title);
+    g->getChatForm()->setName(title);
+
+    if (widget->isActive()) {
+        GUI::setWindowTitle(title);
+    }
+
     g->setName(title);
     FilterCriteria filter = getFilterCriteria();
-    g->getGroupWidget()->searchName(ui->searchContactText->text(), filterGroups(filter));
+    widget->searchName(ui->searchContactText->text(), filterGroups(filter));
 }
 
 void Widget::onGroupPeerAudioPlaying(int groupnumber, int peernumber)