From 25c88b542f7b63789adad861a0975bc2b9e1e871 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 19 Apr 2026 09:19:54 +0300 Subject: [PATCH] tty: Add primary node first when resuming session --- src/backend/tty.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backend/tty.rs b/src/backend/tty.rs index 52f1db2e..684fa374 100644 --- a/src/backend/tty.rs +++ b/src/backend/tty.rs @@ -707,7 +707,14 @@ impl Tty { } // Add new devices. - for (device_id, path) in device_list.into_iter() { + // + // Add the primary node first as later nodes might depend on the primary render + // node being available. + let primary_device_id = self.primary_node.dev_id(); + let primary_device_path = device_list.remove(&primary_device_id); + let primary = primary_device_path.map(|path| (primary_device_id, path)); + + for (device_id, path) in primary.into_iter().chain(device_list) { if let Err(err) = self.device_added(device_id, &path, niri) { warn!("error adding device: {err:?}"); }