From c31b3c801b1d1d813a767a897ebdf34466cf74eb Mon Sep 17 00:00:00 2001 From: "crypro.zoidberg" Date: Wed, 16 Jan 2019 18:59:55 +0300 Subject: [PATCH] fixed deadlock on abort_tx --- src/common/db_backend_lmdb.cpp | 2 +- src/gui/qt-daemon/main.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/db_backend_lmdb.cpp b/src/common/db_backend_lmdb.cpp index 204c1a9b..29870eeb 100644 --- a/src/common/db_backend_lmdb.cpp +++ b/src/common/db_backend_lmdb.cpp @@ -203,7 +203,7 @@ namespace tools if (txe.count == 0 || (txe.read_only && txe.count == 1)) { mdb_txn_abort(txe.ptx); - if (!txe.read_only && txe.count) + if (!txe.read_only && !txe.count) { CRITICAL_SECTION_UNLOCK(m_write_exclusive_lock); LOG_PRINT_CYAN("[DB " << m_path << "] WRITE UNLOCKED(ABORTED)", LOG_LEVEL_3); diff --git a/src/gui/qt-daemon/main.cpp b/src/gui/qt-daemon/main.cpp index 41100040..faf72094 100644 --- a/src/gui/qt-daemon/main.cpp +++ b/src/gui/qt-daemon/main.cpp @@ -44,6 +44,7 @@ int main(int argc, char *argv[]) epee::string_tools::set_module_name_and_folder(argv[0]); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication app(argc, argv); MainWindow viewer; if (!viewer.init_backend(argc, argv))