Do not try to connect namecoin if dontconnect set in config (#1146)
This commit is contained in:
parent
73ebad4a4e
commit
2268413cd0
|
@ -799,19 +799,16 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
|
||||
self.initSettings()
|
||||
|
||||
# Check to see whether we can connect to namecoin. Hide the 'Fetch Namecoin ID' button if we can't.
|
||||
try:
|
||||
options = {}
|
||||
options["type"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpctype')
|
||||
options["host"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpchost')
|
||||
options["port"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpcport')
|
||||
options["user"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpcuser')
|
||||
options["password"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpcpassword')
|
||||
nc = namecoinConnection(options)
|
||||
if nc.test()[0] == 'failed':
|
||||
self.ui.pushButtonFetchNamecoinID.hide()
|
||||
except:
|
||||
logger.error('There was a problem testing for a Namecoin daemon. Hiding the Fetch Namecoin ID button')
|
||||
self.namecoin = namecoinConnection()
|
||||
|
||||
# Check to see whether we can connect to namecoin.
|
||||
# Hide the 'Fetch Namecoin ID' button if we can't.
|
||||
if BMConfigParser().safeGetBoolean(
|
||||
'bitmessagesettings', 'dontconnect'
|
||||
) or self.namecoin.test()[0] == 'failed':
|
||||
logger.warning(
|
||||
'There was a problem testing for a Namecoin daemon. Hiding the'
|
||||
' Fetch Namecoin ID button')
|
||||
self.ui.pushButtonFetchNamecoinID.hide()
|
||||
|
||||
def updateTTL(self, sliderPosition):
|
||||
|
@ -2691,6 +2688,10 @@ class MyForm(settingsmixin.SMainWindow):
|
|||
BMConfigParser().save()
|
||||
self.ui.updateNetworkSwitchMenuLabel(dontconnect_option)
|
||||
|
||||
self.ui.pushButtonFetchNamecoinID.setHidden(
|
||||
dontconnect_option or self.namecoin.test()[0] == 'failed'
|
||||
)
|
||||
|
||||
# Quit selected from menu or application indicator
|
||||
def quit(self):
|
||||
'''quit_msg = "Are you sure you want to exit Bitmessage?"
|
||||
|
|
Loading…
Reference in New Issue
Block a user