From d47be456ff136dcc1477138aeb5882acd8bda349 Mon Sep 17 00:00:00 2001 From: Simon Renblad Date: Mon, 29 Apr 2024 11:21:35 +0800 Subject: [PATCH] artiq_dashboard: connect Devices sub after loading state --- artiq/frontend/artiq_dashboard.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/artiq/frontend/artiq_dashboard.py b/artiq/frontend/artiq_dashboard.py index 2f48db3e3..896efb96c 100755 --- a/artiq/frontend/artiq_dashboard.py +++ b/artiq/frontend/artiq_dashboard.py @@ -236,13 +236,6 @@ def main(): ) atexit_register_coroutine(d_waveform.stop, loop=loop) - def init_cbs(ddb): - moninj_mgr.dm.init_ddb(ddb) - d_waveform.init_ddb(ddb) - return ddb - devices_sub = Subscriber("devices", init_cbs, [moninj_mgr.dm.notify_ddb, d_waveform.notify_ddb]) - loop.run_until_complete(devices_sub.connect(args.server, args.port_notify)) - atexit_register_coroutine(devices_sub.close, loop=loop) d_interactive_args = interactive_args.InteractiveArgsDock( sub_clients["interactive_args"], @@ -278,7 +271,18 @@ def main(): # Otherwise, the windows of those applets that are in detached # QDockWidgets fail to be embedded. main_window.show() + smgr.load() + + # connect devices_sub after loading state, else moninj widgets may not be created + def init_cbs(ddb): + moninj_mgr.dm.init_ddb(ddb) + d_waveform.init_ddb(ddb) + return ddb + devices_sub = Subscriber("devices", init_cbs, [moninj_mgr.dm.notify_ddb, d_waveform.notify_ddb]) + loop.run_until_complete(devices_sub.connect(args.server, args.port_notify)) + + atexit_register_coroutine(devices_sub.close, loop=loop) smgr.start(loop=loop) atexit_register_coroutine(smgr.stop, loop=loop)