diff --git a/build.gradle b/build.gradle index 1e97e4aa0f6..5d480e62cef 100644 --- a/build.gradle +++ b/build.gradle @@ -386,7 +386,6 @@ configure(project(':desktop')) { apply plugin: 'witness' apply from: '../gradle/witness/gradle-witness.gradle' - version = '1.5.3' version = '1.5.3-SNAPSHOT' mainClassName = 'bisq.desktop.app.BisqAppMain' diff --git a/core/src/main/java/bisq/core/app/BisqHeadlessApp.java b/core/src/main/java/bisq/core/app/BisqHeadlessApp.java index 38c9f478524..ae9bd256937 100644 --- a/core/src/main/java/bisq/core/app/BisqHeadlessApp.java +++ b/core/src/main/java/bisq/core/app/BisqHeadlessApp.java @@ -97,6 +97,12 @@ protected void setupHandlers() { bisqSetup.setQubesOSInfoHandler(() -> log.info("setQubesOSInfoHandler")); bisqSetup.setDownGradePreventionHandler(lastVersion -> log.info("Downgrade from version {} to version {} is not supported", lastVersion, Version.VERSION)); + bisqSetup.setDaoRequiresRestartHandler(() -> { + log.info("There was a problem with synchronizing the DAO state. " + + "A restart of the application is required to fix the issue."); + gracefulShutDownHandler.gracefulShutDown(() -> { + }); + }); corruptedStorageFileHandler.getFiles().ifPresent(files -> log.warn("getCorruptedDatabaseFiles. files={}", files)); tradeManager.setTakeOfferRequestErrorMessageHandler(errorMessage -> log.error("onTakeOfferRequestErrorMessageHandler")); diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 6c35b69d15a..4a3f82283c4 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -2866,6 +2866,7 @@ popup.info.shutDownWithOpenOffers=Bisq is being shut down, but there are open of popup.info.qubesOSSetupInfo=It appears you are running Bisq on Qubes OS. \n\n\ Please make sure your Bisq qube is setup according to our Setup Guide at [HYPERLINK:https://bisq.wiki/Running_Bisq_on_Qubes]. popup.warn.downGradePrevention=Downgrade from version {0} to version {1} is not supported. Please use the latest Bisq version. +popup.warn.daoRequiresRestart=There was a problem with synchronizing the DAO state. You have to restart the application to fix the issue. popup.privateNotification.headline=Important private notification! diff --git a/inventory/src/main/java/bisq/inventory/InventoryMonitorMain.java b/inventory/src/main/java/bisq/inventory/InventoryMonitorMain.java index b7eb4efff24..67925b6fc0b 100644 --- a/inventory/src/main/java/bisq/inventory/InventoryMonitorMain.java +++ b/inventory/src/main/java/bisq/inventory/InventoryMonitorMain.java @@ -47,6 +47,7 @@ @Slf4j public class InventoryMonitorMain { + private static InventoryMonitor inventoryMonitor; private static boolean stopped;