Fix regressions regarding invites & slowness during shutdown

This commit is contained in:
Konstantinos Sideris 2018-06-17 18:44:04 +03:00
parent d081fe9b9e
commit 197b2dac74
5 changed files with 8 additions and 11 deletions

View File

@ -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

2
deps/CMakeLists.txt vendored
View File

@ -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)

View File

@ -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());

View File

@ -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;

View File

@ -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);
}
});