diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java index 253dee03..b930c6ee 100644 --- a/src/main/java/org/qortal/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -312,6 +312,10 @@ public class Controller extends Thread { return this.buildVersion; } + public String getVersionStringWithoutPrefix() { + return this.buildVersion.replaceFirst(VERSION_PREFIX, ""); + } + /** Returns current blockchain height, or 0 if it's not available. */ public int getChainHeight() { synchronized (this.latestBlocks) { diff --git a/src/main/java/org/qortal/gui/SplashFrame.java b/src/main/java/org/qortal/gui/SplashFrame.java index 967377d1..03408757 100644 --- a/src/main/java/org/qortal/gui/SplashFrame.java +++ b/src/main/java/org/qortal/gui/SplashFrame.java @@ -9,6 +9,7 @@ import javax.swing.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.qortal.controller.Controller; public class SplashFrame { @@ -39,7 +40,8 @@ public class SplashFrame { add(imageLabel); // Add status label - statusLabel = new JLabel("Starting Qortal Core...", JLabel.CENTER); + String text = String.format("Starting Qortal Core v%s...", Controller.getInstance().getVersionStringWithoutPrefix()); + statusLabel = new JLabel(text, JLabel.CENTER); statusLabel.setMaximumSize(new Dimension(500, 50)); statusLabel.setFont(new Font("Verdana", Font.PLAIN, 22)); statusLabel.setBackground(new Color(255, 255, 255)); diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java index 62f75a7e..e28e9114 100644 --- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java @@ -9,6 +9,7 @@ import java.util.stream.Collectors; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.qortal.controller.Controller; import org.qortal.controller.tradebot.BitcoinACCTv1TradeBot; import org.qortal.gui.SplashFrame; @@ -33,7 +34,8 @@ public class HSQLDBDatabaseUpdates { while (databaseUpdating(connection, wasPristine)) incrementDatabaseVersion(connection); - SplashFrame.getInstance().updateStatus("Starting Qortal Core..."); + String text = String.format("Starting Qortal Core v%s...", Controller.getInstance().getVersionStringWithoutPrefix()); + SplashFrame.getInstance().updateStatus(text); return wasPristine; }