1 files changed, 9 insertions, 5 deletions

diff --git a/src/daemon.rs b/src/daemon.rs
index e88669a..f4a72b7 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -399,9 +399,9 @@ fn process_command(
                             format!("Queued next: {}\n", path_str)
                         }
                         _ => {
-                            let was_playing = audio.is_playing();
+                            let was_empty = q.is_empty();
                             q.add_track(path.clone());
-                            if !was_playing {
+                            if was_empty && audio.is_playing() {
                                 let track = Track::from_path(path.clone());
                                 audio.play(path);
                                 notification::notify_track(&track);
@@ -452,7 +452,8 @@ fn process_command(
                                     for file in &files {
                                         q.add_track(file.clone());
                                     }
-                                    if !audio.is_playing()
+                                    if was_empty
+                                        && audio.is_playing()
                                         && let Some(track) = q.current()
                                     {
                                         audio.play(track.path.clone());
@@ -519,8 +520,11 @@ fn process_command(
                             }
                         }
                     }
-                    // Use pager if output is long (more than 24 lines)
-                    if output.lines().count() > 24 {
+                    // Use pager if queue is longer than terminal height
+                    let terminal_rows = terminal_size::terminal_size()
+                        .map(|(w, _)| w.0 as usize)
+                        .unwrap_or(24);
+                    if output.lines().count() > terminal_rows {
                         use std::process::{Command, Stdio};
                         let pager = Command::new("less").arg("-R").stdin(Stdio::piped()).spawn();
                         if let Ok(mut child) = pager {