aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-02-19 22:16:13 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-02-19 22:16:13 -0500
commit386c5e3d305a97a47461d1d606850597fe17c317 (patch)
treeb0dc39e0f0b85fc98ee8f1fd4e78e3db9b359dc0
parent5069e6ecaeb8ff20e20952835690b6b3db5aa056 (diff)
parent872b18d5afe2c21fc0379101aed3c626751dba5a (diff)
downloadmonzero-gui-386c5e3d305a97a47461d1d606850597fe17c317.tar.gz
monzero-gui-386c5e3d305a97a47461d1d606850597fe17c317.tar.xz
monzero-gui-386c5e3d305a97a47461d1d606850597fe17c317.zip
Merge pull request #2777
872b18d Simple mode: don't override bootstrap daemon textbox (selsta)
-rw-r--r--components/NetworkStatusItem.qml2
-rw-r--r--main.qml4
2 files changed, 3 insertions, 3 deletions
diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml
index eeb85d61..05fb55d1 100644
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.qml
@@ -163,7 +163,7 @@ Rectangle {
visible: (
!appWindow.disconnected &&
!persistentSettings.useRemoteNode &&
- persistentSettings.bootstrapNodeAddress == "auto"
+ (persistentSettings.bootstrapNodeAddress == "auto" || persistentSettings.walletMode < 2)
)
MouseArea {
diff --git a/main.qml b/main.qml
index d104efe8..c976bb41 100644
--- a/main.qml
+++ b/main.qml
@@ -675,7 +675,8 @@ ApplicationWindow {
appWindow.showProcessingSplash(qsTr("Waiting for daemon to start..."))
const noSync = appWindow.walletMode === 0;
- daemonManager.start(flags, persistentSettings.nettype, persistentSettings.blockchainDataDir, persistentSettings.bootstrapNodeAddress, noSync);
+ const bootstrapNodeAddress = persistentSettings.walletMode < 2 ? "auto" : persistentSettings.bootstrapNodeAddress
+ daemonManager.start(flags, persistentSettings.nettype, persistentSettings.blockchainDataDir, bootstrapNodeAddress, noSync);
}
function stopDaemon(){
@@ -2079,7 +2080,6 @@ ApplicationWindow {
function applyWalletMode(mode){
if (mode < 2) {
persistentSettings.useRemoteNode = false;
- persistentSettings.bootstrapNodeAddress = "auto";
if (middlePanel.settingsView.settingsStateViewState === "Node" || middlePanel.settingsView.settingsStateViewState === "Log") {
middlePanel.settingsView.settingsStateViewState = "Wallet"