2 files changed, 28 insertions, 22 deletions
diff --git a/Swift/QtUI/QtUIFactory.cpp b/Swift/QtUI/QtUIFactory.cpp
index a9e0e8f..9eed822 100644
--- a/Swift/QtUI/QtUIFactory.cpp
+++ b/Swift/QtUI/QtUIFactory.cpp
@@ -1,38 +1,40 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtUIFactory.h>
 
+#include <algorithm>
+
 #include <QSplitter>
 
 #include <Swiften/Whiteboard/WhiteboardSession.h>
 
 #include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
 
 #include <Swift/QtUI/MUCSearch/QtMUCSearchWindow.h>
 #include <Swift/QtUI/QtAdHocCommandWindow.h>
 #include <Swift/QtUI/QtBlockListEditorWindow.h>
 #include <Swift/QtUI/QtChatTabs.h>
 #include <Swift/QtUI/QtChatTabsBase.h>
 #include <Swift/QtUI/QtChatWindow.h>
 #include <Swift/QtUI/QtChatWindowFactory.h>
 #include <Swift/QtUI/QtContactEditWindow.h>
 #include <Swift/QtUI/QtFileTransferListWidget.h>
 #include <Swift/QtUI/QtHighlightEditor.h>
 #include <Swift/QtUI/QtHistoryWindow.h>
 #include <Swift/QtUI/QtJoinMUCWindow.h>
 #include <Swift/QtUI/QtLoginWindow.h>
 #include <Swift/QtUI/QtMainWindow.h>
 #include <Swift/QtUI/QtProfileWindow.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
 #include <Swift/QtUI/QtSingleWindow.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtSystemTray.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/QtXMLConsoleWidget.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchWindow.h>
 #include <Swift/QtUI/Whiteboard/QtWhiteboardWindow.h>
 
@@ -93,81 +95,84 @@ LoginWindow* QtUIFactory::createLoginWindow(UIEventStream* eventStream) {
 
 #ifndef SWIFT_MOBILE
     QVariant loginWindowGeometryVariant = qtOnlySettings->getQSettings()->value("loginWindowGeometry");
     if (loginWindowGeometryVariant.isValid()) {
         loginWindow->restoreGeometry(loginWindowGeometryVariant.toByteArray());
     }
     connect(loginWindow, SIGNAL(geometryChanged()), this, SLOT(handleLoginWindowGeometryChanged()));
     if (startMinimized) loginWindow->hide();
 #endif
     return loginWindow;
 }
 
 void QtUIFactory::handleLoginWindowGeometryChanged() {
     qtOnlySettings->getQSettings()->setValue("loginWindowGeometry", loginWindow->saveGeometry());
 }
 
 EventWindow* QtUIFactory::createEventWindow() {
     return lastMainWindow->getEventWindow();
 }
 
 ChatListWindow* QtUIFactory::createChatListWindow(UIEventStream*) {
     return lastMainWindow->getChatListWindow();
 }
 
 MUCSearchWindow* QtUIFactory::createMUCSearchWindow() {
         return new QtMUCSearchWindow();
 }
 
 ChatWindow* QtUIFactory::createChatWindow(const JID& contact, UIEventStream* eventStream) {
     QtChatWindow* window = dynamic_cast<QtChatWindow*>(chatWindowFactory->createChatWindow(contact, eventStream));
+
+    // remove already closed and thereby deleted chat windows
+    chatWindows.erase(std::remove_if(chatWindows.begin(), chatWindows.end(),
+        [](QPointer<QtChatWindow>& window) {
+            return window.isNull();
+        }), chatWindows.end());
+
     chatWindows.push_back(window);
-    std::vector<QPointer<QtChatWindow> > deletions;
-    foreach (QPointer<QtChatWindow> existingWindow, chatWindows) {
-        if (existingWindow.isNull()) {
-            deletions.push_back(existingWindow);
-        } else {
-            connect(window, SIGNAL(fontResized(int)), existingWindow, SLOT(handleFontResized(int)));
-            connect(existingWindow, SIGNAL(fontResized(int)), window, SLOT(handleFontResized(int)));
-        }
-    }
-    foreach (QPointer<QtChatWindow> deletedWindow, deletions) {
-        chatWindows.erase(std::remove(chatWindows.begin(), chatWindows.end(), deletedWindow), chatWindows.end());
-    }
+
     connect(window, SIGNAL(fontResized(int)), this, SLOT(handleChatWindowFontResized(int)));
     window->handleFontResized(chatFontSize);
     return window;
 }
 
 void QtUIFactory::handleChatWindowFontResized(int size) {
     chatFontSize = size;
     settings->storeSetting(QtUISettingConstants::CHATWINDOW_FONT_SIZE, size);
+
+    // resize font in other chat windows
+    for (auto&& existingWindow : chatWindows) {
+        if (!existingWindow.isNull()) {
+            existingWindow->handleFontResized(size);
+        }
+    }
 }
 
 UserSearchWindow* QtUIFactory::createUserSearchWindow(UserSearchWindow::Type type, UIEventStream* eventStream, const std::set<std::string>& groups) {
     return new QtUserSearchWindow(eventStream, type, groups, qtOnlySettings);
 }
 
 JoinMUCWindow* QtUIFactory::createJoinMUCWindow(UIEventStream* uiEventStream) {
     return new QtJoinMUCWindow(uiEventStream);
 }
 
 ProfileWindow* QtUIFactory::createProfileWindow() {
     return new QtProfileWindow();
 }
 
 ContactEditWindow* QtUIFactory::createContactEditWindow() {
     return new QtContactEditWindow();
 }
 
 WhiteboardWindow* QtUIFactory::createWhiteboardWindow(std::shared_ptr<WhiteboardSession> whiteboardSession) {
     return new QtWhiteboardWindow(whiteboardSession);
 }
 
 HighlightEditorWindow* QtUIFactory::createHighlightEditorWindow() {
     return new QtHighlightEditor(qtOnlySettings);
 }
 
 BlockListEditorWidget *QtUIFactory::createBlockListEditorWidget() {
     return new QtBlockListEditorWindow();
 }
 
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h
index a57d509..ce3b533 100644
--- a/Swift/QtUI/QtUIFactory.h
+++ b/Swift/QtUI/QtUIFactory.h
@@ -1,61 +1,62 @@
 /*
  * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <vector>
+
 #include <QObject>
 #include <QPointer>
 
 #include <Swift/Controllers/UIInterfaces/UIFactory.h>
 
 class QSplitter;
 
 namespace Swift {
-    class QtSettingsProvider;
-    class SettingsProviderHierachy;
-    class QtChatTabsBase;
     class QtChatTabs;
-    class QtSystemTray;
-    class QtLoginWindow;
-    class QtMainWindow;
+    class QtChatTabsBase;
     class QtChatTheme;
-    class QtChatWindowFactory;
     class QtChatWindow;
+    class QtChatWindowFactory;
+    class QtLoginWindow;
+    class QtMainWindow;
+    class QtSettingsProvider;
+    class QtSingleWindow;
+    class QtSystemTray;
+    class SettingsProviderHierachy;
+    class StatusCache;
     class TimerFactory;
-    class historyWindow_;
     class WhiteboardSession;
-    class StatusCache;
-    class QtSingleWindow;
 
     class QtUIFactory : public QObject, public UIFactory {
             Q_OBJECT
         public:
             QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabsBase* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, bool startMinimized, bool emoticonsExist, bool enableAdHocCommandOnJID);
 
             virtual XMLConsoleWidget* createXMLConsoleWidget();
             virtual HistoryWindow* createHistoryWindow(UIEventStream*);
             virtual MainWindow* createMainWindow(UIEventStream* eventStream);
             virtual LoginWindow* createLoginWindow(UIEventStream* eventStream);
             virtual EventWindow* createEventWindow();
             virtual ChatListWindow* createChatListWindow(UIEventStream*);
             virtual MUCSearchWindow* createMUCSearchWindow();
             virtual ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream);
             virtual UserSearchWindow* createUserSearchWindow(UserSearchWindow::Type type, UIEventStream* eventStream, const std::set<std::string>& groups);
             virtual JoinMUCWindow* createJoinMUCWindow(UIEventStream* uiEventStream);
             virtual ProfileWindow* createProfileWindow();
             virtual ContactEditWindow* createContactEditWindow();
             virtual FileTransferListWidget* createFileTransferListWidget();
             virtual WhiteboardWindow* createWhiteboardWindow(std::shared_ptr<WhiteboardSession> whiteboardSession);
             virtual HighlightEditorWindow* createHighlightEditorWindow();
             virtual BlockListEditorWidget* createBlockListEditorWidget();
             virtual AdHocCommandWindow* createAdHocCommandWindow(std::shared_ptr<OutgoingAdHocCommandSession> command);
 
         private slots:
             void handleLoginWindowGeometryChanged();
             void handleChatWindowFontResized(int);
             void handleHistoryWindowFontResized(int);
 
         private: