fix: delayed session name

dj95 · Apr 25, 2024 · 4777bdd · 4777bdd
1 parent 583962d
commit 4777bdd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/bin/zjstatus.rs b/src/bin/zjstatus.rs
@@ -136,14 +136,16 @@ impl ZellijPlugin for State {
             Event::ModeUpdate(mode_info) => {
                 tracing::Span::current().record("event_type", "Event::ModeUpdate");
                 tracing::debug!(mode = ?mode_info.mode);
+                tracing::debug!(mode = ?mode_info.session_name);
+
+                self.state.mode = mode_info;
+                self.state.cache_mask = UpdateEventMask::Mode as u8;
 
                 if !self.got_permissions {
                     tracing::info!("no permissions");
                     return false;
                 }
 
-                self.state.mode = mode_info;
-                self.state.cache_mask = UpdateEventMask::Mode as u8;
                 should_render = true;
             }
             Event::PaneUpdate(pane_info) => {
@@ -231,36 +233,39 @@ impl ZellijPlugin for State {
                     }
                 }
 
-                self.state.cache_mask = UpdateEventMask::Session as u8;
                 self.state.sessions = session_info;
+                self.state.cache_mask = UpdateEventMask::Session as u8;
 
                 should_render = true;
             }
             Event::TabUpdate(tab_info) => {
                 tracing::Span::current().record("event_type", "Event::TabUpdate");
                 tracing::debug!(tab_count = ?tab_info.len());
 
+                self.state.cache_mask = UpdateEventMask::Tab as u8;
+                self.state.tabs = tab_info;
+
                 if !self.got_permissions {
                     tracing::info!("no permissions");
                     return false;
                 }
 
-                self.state.cache_mask = UpdateEventMask::Tab as u8;
-                self.state.tabs = tab_info;
                 should_render = true;
             }
             _ => (),
         };
         should_render
     }
 
+    #[tracing::instrument(skip_all)]
     fn render(&mut self, _rows: usize, cols: usize) {
         if !self.got_permissions {
             return;
         }
 
         self.state.cols = cols;
 
+        tracing::debug!("{:?}", self.state.mode.session_name);
         print!(
             "{}",
             self.module_config

diff --git a/src/config.rs b/src/config.rs
@@ -39,7 +39,7 @@ pub fn event_mask_from_widget_name(name: &str) -> u8 {
         "datetime" => UpdateEventMask::Always as u8,
         "mode" => UpdateEventMask::Mode as u8,
         "notifications" => UpdateEventMask::Always as u8,
-        "session" => UpdateEventMask::Session as u8,
+        "session" => UpdateEventMask::Mode as u8,
         "swap_layout" => UpdateEventMask::Tab as u8,
         "tabs" => UpdateEventMask::Tab as u8,
         _ => UpdateEventMask::None as u8,