From 197b2dac748563f99de4a941a59e795dc759cca0 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Sun, 17 Jun 2018 18:44:04 +0300
Subject: [PATCH] Fix regressions regarding invites & slowness during shutdown

---
 .ci/linux/deploy.sh             | 9 +++------
 deps/CMakeLists.txt             | 2 +-
 include/timeline/TimelineView.h | 2 --
 src/Cache.cc                    | 3 ++-
 src/main.cc                     | 3 ++-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh
index 39fb0e30..7b5b8e4a 100755
--- a/.ci/linux/deploy.sh
+++ b/.ci/linux/deploy.sh
@@ -30,13 +30,10 @@ unset QTDIR
 unset QT_PLUGIN_PATH 
 unset LD_LIBRARY_PATH
 
-cp -R .deps/usr/lib/* ${DIR}/usr/lib
+export ARCH=$(uname -m)
 
-ldd ${DIR}/usr/bin/nheko
-
-./linuxdeployqt*.AppImage \
-    ${DIR}/usr/share/applications/nheko.desktop \
-    -appimage
+./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs
+./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -appimage
 
 chmod +x nheko-x86_64.AppImage
 
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 34bcea31..06b1f7e1 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -40,7 +40,7 @@ set(MATRIX_STRUCTS_URL https://github.com/mujx/matrix-structs)
 set(MATRIX_STRUCTS_TAG eeb7373729a1618e2b3838407863342b88b8a0de)
 
 set(MTXCLIENT_URL https://github.com/mujx/mtxclient)
-set(MTXCLIENT_TAG e45b1c85fce52f8ed516fd98a9cbb6a110a20d09)
+set(MTXCLIENT_TAG 68188721e042ff5b47ea9a87aa97d3a9efbca989)
 
 set(OLM_URL https://git.matrix.org/git/olm.git)
 set(OLM_TAG 4065c8e11a33ba41133a086ed3de4da94dcb6bae)
diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h
index a985f75b..a86c0286 100644
--- a/include/timeline/TimelineView.h
+++ b/include/timeline/TimelineView.h
@@ -362,8 +362,6 @@ TimelineView::addUserMessage(const QString &url,
 
         lastMessageDirection_ = TimelineDirection::Bottom;
 
-        QApplication::processEvents();
-
         // Keep track of the sender and the timestamp of the current message.
         saveLastMessageInfo(local_user_, QDateTime::currentDateTime());
 
diff --git a/src/Cache.cc b/src/Cache.cc
index 41a759ab..397dd05f 100644
--- a/src/Cache.cc
+++ b/src/Cache.cc
@@ -900,7 +900,8 @@ Cache::getRoomInfo(const std::vector<std::string> &rooms)
 {
         std::map<QString, RoomInfo> room_info;
 
-        auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY);
+        // TODO This should be read only.
+        auto txn = lmdb::txn::begin(env_);
 
         for (const auto &room : rooms) {
                 lmdb::val data;
diff --git a/src/main.cc b/src/main.cc
index 24524c2c..327ec587 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -166,8 +166,9 @@ main(int argc, char *argv[])
         QObject::connect(&app, &QApplication::aboutToQuit, &w, [&w]() {
                 w.saveCurrentWindowSize();
                 if (http::v2::client() != nullptr) {
+                        nhlog::net()->info("shutting down all I/O threads & open connections");
                         http::v2::client()->shutdown();
-                        http::v2::client()->close();
+                        http::v2::client()->close(true);
                 }
         });