Skip to content

Commit

Permalink
FIX: make the curses text UI not crash when started in --offline mode…
Browse files Browse the repository at this point in the history
… (matching ThomasV's recent changes to the other UIs)
  • Loading branch information
mkramlich committed Nov 5, 2013
1 parent c84cc5b commit 583bb8f
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions gui/text.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def __init__(self, config, network):
exit()

self.wallet = Wallet(storage)
self.wallet.start_threads(network)
if self.network:
self.wallet.start_threads(network)

locale.setlocale(locale.LC_ALL, '')
self.encoding = locale.getpreferredencoding()
Expand Down Expand Up @@ -50,11 +51,13 @@ def __init__(self, config, network):
self.str_amount = ""
self.str_fee = ""
self.history = None

self.network.register_callback('updated', self.update)
self.network.register_callback('connected', self.refresh)
self.network.register_callback('disconnected', self.refresh)
self.network.register_callback('disconnecting', self.refresh)

if self.network:
self.network.register_callback('updated', self.update)
self.network.register_callback('connected', self.refresh)
self.network.register_callback('disconnected', self.refresh)
self.network.register_callback('disconnecting', self.refresh)

self.tab_names = [_("History"), _("Send"), _("Receive"), _("Contacts"), _("Wall")]
self.num_tabs = len(self.tab_names)

Expand Down Expand Up @@ -120,7 +123,7 @@ def update_history(self):


def print_balance(self):
if self.network.interface and self.network.interface.is_connected:
if self.network and self.network.interface and self.network.interface.is_connected:
if not self.wallet.up_to_date:
msg = _( "Synchronizing..." )
else:
Expand Down Expand Up @@ -162,7 +165,8 @@ def print_send_tab(self):
self.stdscr.addstr( 12, 25, _("[Clear]"), curses.A_REVERSE if self.pos%6==5 else curses.color_pair(2))

def print_banner(self):
self.print_list( self.network.banner.split('\n'))
if self.network:
self.print_list( self.network.banner.split('\n'))

def print_list(self, list, firstline = None):
self.maxpos = len(list)
Expand Down Expand Up @@ -339,6 +343,7 @@ def run_popup(self, title, items):


def network_dialog(self):
if not self.network: return
auto_connect = self.network.config.get('auto_cycle')
host, port, protocol = self.network.default_server.split(':')
srv = 'auto-connect' if auto_connect else self.network.default_server
Expand Down

0 comments on commit 583bb8f

Please sign in to comment.