mirror of
https://github.com/pdxlocations/contact.git
synced 2026-08-09 02:12:58 +02:00
Refactor settings menu to improve channel request handling and status updates
This commit is contained in:
@@ -964,7 +964,9 @@ def handle_backtick(stdscr: curses.window) -> None:
|
||||
settings_menu(
|
||||
stdscr,
|
||||
interface,
|
||||
node=interface.getNode(remote_node_num),
|
||||
# Settings requests configs explicitly; avoid getNode's
|
||||
# implicit channel request racing that setup.
|
||||
node=interface.getNode(remote_node_num, False),
|
||||
remote=True,
|
||||
status_callback=lambda message: update_remote_admin_wait(wait_win, message),
|
||||
)
|
||||
|
||||
@@ -326,7 +326,10 @@ def settings_menu(
|
||||
_request_remote_with_timeout(node.requestConfig, config_type)
|
||||
if status_callback:
|
||||
status_callback("Requesting channels…")
|
||||
_request_remote_with_timeout(node.requestChannels)
|
||||
node.requestChannels()
|
||||
if status_callback:
|
||||
status_callback("Waiting for channel list…")
|
||||
_request_remote_with_timeout(node.waitForConfig, "channels")
|
||||
|
||||
menu = generate_menu_from_protobuf(interface, node=node, include_app_settings=not remote)
|
||||
menu_state.current_menu = menu["Main Menu"]
|
||||
|
||||
Reference in New Issue
Block a user