crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Fixed bugs from merge conflict, causing incorrect systray statuses in some cases.

Browse Source
This commit is contained in:
CalDescent 2022-07-02 10:33:00 +01:00
parent 7c5932a512
commit d7e7c1f48c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/controller/Controller.java
View File

@ -819,7 +819,7 @@ public class Controller extends Thread {
actionText = String.format("%s", Translator.INSTANCE.translate("SysTray", "SYNCHRONIZING_BLOCKCHAIN")); actionText = String.format("%s", Translator.INSTANCE.translate("SysTray", "SYNCHRONIZING_BLOCKCHAIN"));
SysTray.getInstance().setTrayIcon(3); SysTray.getInstance().setTrayIcon(3);
} }
else if (OnlineAccountsManager.getInstance().hasOnlineAccounts()) { else if (OnlineAccountsManager.getInstance().hasActiveOnlineAccountSignatures()) {
actionText = Translator.INSTANCE.translate("SysTray", "MINTING_ENABLED"); actionText = Translator.INSTANCE.translate("SysTray", "MINTING_ENABLED");
SysTray.getInstance().setTrayIcon(2); SysTray.getInstance().setTrayIcon(2);
} }

2
src/main/java/org/qortal/controller/OnlineAccountsManager.java
View File

@ -471,7 +471,7 @@ public class OnlineAccountsManager {
final Long minLatestBlockTimestamp = NTP.getTime() - (2 * 60 * 60 * 1000L); final Long minLatestBlockTimestamp = NTP.getTime() - (2 * 60 * 60 * 1000L);
boolean isUpToDate = Controller.getInstance().isUpToDate(minLatestBlockTimestamp); boolean isUpToDate = Controller.getInstance().isUpToDate(minLatestBlockTimestamp);
return isUpToDate && hasOnlineAccounts(); return isUpToDate && hasOurOnlineAccounts();
} }
public boolean hasOurOnlineAccounts() { public boolean hasOurOnlineAccounts() {