monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-26 20:45:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2777

Browse source 
872b18d Simple mode: don't override bootstrap daemon textbox (selsta)
This commit is contained in:
luigi1111 2020-02-19 22:16:13 -05:00
commit 386c5e3d30
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/NetworkStatusItem.qml
View file

@ -163,7 +163,7 @@ Rectangle {
visible: ( visible: (
!appWindow.disconnected && !appWindow.disconnected &&
!persistentSettings.useRemoteNode && !persistentSettings.useRemoteNode &&
persistentSettings.bootstrapNodeAddress == "auto" (persistentSettings.bootstrapNodeAddress == "auto" || persistentSettings.walletMode < 2)
) )
MouseArea { MouseArea {

4
main.qml
View file

@ -675,7 +675,8 @@ ApplicationWindow {
appWindow.showProcessingSplash(qsTr("Waiting for daemon to start...")) appWindow.showProcessingSplash(qsTr("Waiting for daemon to start..."))
const noSync = appWindow.walletMode === 0; 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(){ function stopDaemon(){
@ -2079,7 +2080,6 @@ ApplicationWindow {
function applyWalletMode(mode){ function applyWalletMode(mode){
if (mode < 2) { if (mode < 2) {
persistentSettings.useRemoteNode = false; persistentSettings.useRemoteNode = false;
persistentSettings.bootstrapNodeAddress = "auto";
if (middlePanel.settingsView.settingsStateViewState === "Node" || middlePanel.settingsView.settingsStateViewState === "Log") { if (middlePanel.settingsView.settingsStateViewState === "Node" || middlePanel.settingsView.settingsStateViewState === "Log") {
middlePanel.settingsView.settingsStateViewState = "Wallet" middlePanel.settingsView.settingsStateViewState = "Wallet"