1 files changed, 5 insertions, 0 deletions
diff --git a/Swift/QtUI/QtChatTabs.cpp b/Swift/QtUI/QtChatTabs.cpp
index e30478c..f9a42a4 100644
--- a/Swift/QtUI/QtChatTabs.cpp
+++ b/Swift/QtUI/QtChatTabs.cpp
@@ -35,79 +35,84 @@ void QtChatTabs::closeEvent(QCloseEvent* event) {
 	event->accept();
 }
 
 void QtChatTabs::addTab(QtTabbable* tab) {
 	tabs_->addTab(tab, tab->windowTitle());
 	connect(tab, SIGNAL(titleUpdated()), this, SLOT(handleTabTitleUpdated()));
 	connect(tab, SIGNAL(windowClosing()), this, SLOT(handleTabClosing()));
 	connect(tab, SIGNAL(windowOpening()), this, SLOT(handleWidgetShown()));
 	connect(tab, SIGNAL(wantsToActivate()), this, SLOT(handleWantsToActivate()));
 }
 
 void QtChatTabs::handleWidgetShown() {
 	QtTabbable* widget = qobject_cast<QtTabbable*>(sender());
 	if (!widget) {
 		return;
 	}
 	if (tabs_->indexOf(widget) >= 0) {
 		return;
 	}
 	addTab(widget);
 	show();
 }
 
 void QtChatTabs::handleWantsToActivate() {
 	QtTabbable* widget = qobject_cast<QtTabbable*>(sender());
 	Q_ASSERT(widget);
 	Q_ASSERT(tabs_->indexOf(widget) >= 0);
 	//Un-minimize and bring to front.
 	setWindowState(windowState() & ~Qt::WindowMinimized);
 	setWindowState(windowState() | Qt::WindowActive);
 	tabs_->setCurrentWidget(widget);
 	widget->setFocus();
 	activateWindow();
 }
 
 void QtChatTabs::handleTabClosing() {
 	QWidget* widget = qobject_cast<QWidget*>(sender());
 	if (!widget) {
 		return;
 	}
 	int index = tabs_->indexOf(widget);
 	if (index < 0) {
 		return;
 	}
 	tabs_->removeTab(index);
 	if (tabs_->count() == 0) {
 		hide();
 	}
+	handleTabTitleUpdated(tabs_->currentWidget());
 }
 
 void QtChatTabs::handleTabCloseRequested(int index) {
 	QWidget* widget = tabs_->widget(index);
 	widget->close();
 }
 
 void QtChatTabs::handleTabTitleUpdated() {
 	QWidget* widget = qobject_cast<QWidget*>(sender());
+	handleTabTitleUpdated(widget);
+}
+
+void QtChatTabs::handleTabTitleUpdated(QWidget* widget) {
 	if (!widget) {
 		return;
 	}
 	int index = tabs_->indexOf(widget);
 	if (index < 0) {
 		return;
 	}
 	tabs_->setTabText(index, widget->windowTitle());
 	if (widget == tabs_->currentWidget()) {
 		setWindowTitle(widget->windowTitle());
 	}
 }
 
 void QtChatTabs::resizeEvent(QResizeEvent*) {
 	emit geometryChanged();
 }
 
 void QtChatTabs::moveEvent(QMoveEvent*) {
 	emit geometryChanged();	
 }
 
 }