From d6e620e3d28162b43103d554b98f25c101467757 Mon Sep 17 00:00:00 2001 From: Stefan Kebekus Date: Sat, 4 Apr 2020 17:31:03 +0200 Subject: [PATCH] Fix a problem where the app becomes unresponsive for 30sec when a newly installed map is immediately deleted --- CMakeLists.txt | 4 ++-- src/Downloadable.cpp | 2 +- src/text/whatsnew.html.in | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f7a6e16b..80e6b20f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,9 @@ option(BUILD_DOC "Build documentation" OFF) # Project data # -project(enroute VERSION 1.6.1) +project(enroute VERSION 1.6.2) set(APP_ID de.akaflieg_freiburg.enroute) -set(PROJECT_DATE 2020-04-02) +set(PROJECT_DATE 2020-04-04) math(EXPR PROJECT_VERSION_CODE 10000*${PROJECT_VERSION_MAJOR}+100*${PROJECT_VERSION_MINOR}+${PROJECT_VERSION_PATCH}) add_compile_definitions(PROJECT_VERSION="${PROJECT_VERSION}") diff --git a/src/Downloadable.cpp b/src/Downloadable.cpp index 60828fb67..8e14dec88 100644 --- a/src/Downloadable.cpp +++ b/src/Downloadable.cpp @@ -147,7 +147,7 @@ void Downloadable::deleteLocalFile() { bool oldUpdatable = updatable(); emit aboutToChangeLocalFile(_localFileName); - QLockFile lockFile(_localFileName); + QLockFile lockFile(_localFileName + ".lock"); lockFile.lock(); QFile::remove(_localFileName); lockFile.unlock(); diff --git a/src/text/whatsnew.html.in b/src/text/whatsnew.html.in index 164958913..4a45b1f5e 100644 --- a/src/text/whatsnew.html.in +++ b/src/text/whatsnew.html.in @@ -1,6 +1,5 @@ -

Version ${PROJECT_VERSION} fixes two bugs. Thanks for reporting those - issues!

+

Version ${PROJECT_VERSION} is a bug-fixing release.

-

Fly safely and enjoy many happy landings!

+

Fly safely, stay healthy and enjoy many happy landings!

-- Stefan Kebekus.