1 files changed, 16 insertions, 16 deletions

diff --git a/src/daemon.rs b/src/daemon.rs
index 06b925e..59fc3d8 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -544,10 +544,10 @@ fn process_command(
                 );
                 let result = match temp_scrobbler.validate_listenbrainz_token() {
                     Ok(Some(user)) => {
-                        notification::notify_change(&format!(
-                            "Logged in to ListenBrainz as {}",
-                            user
-                        ));
+                        notification::notify(
+                            "RSPlayer scrobbler login",
+                            &format!("Logged in to ListenBrainz as {}", user),
+                        );
                         format!("ListenBrainz token valid (user: {})\n", user)
                     }
                     Ok(None) => {
@@ -779,19 +779,19 @@ fn process_command(
                                     for file in &files {
                                         q.add_track(file.clone());
                                     }
-                                    if was_empty
-                                        && !was_playing
-                                        && let Some(track) = q.current()
-                                    {
-                                        audio.play(track.path.clone());
-                                        send_now_playing(scrobbler, track);
-                                        if let Ok(mut s) = scrobble_state.lock() {
-                                            s.start(track.clone());
+                                    if was_empty && !was_playing {
+                                        q.shuffle_initial();
+                                        if let Some(track) = q.current() {
+                                            audio.play(track.path.clone());
+                                            send_now_playing(scrobbler, track);
+                                            if let Ok(mut s) = scrobble_state.lock() {
+                                                s.start(track.clone());
+                                            }
+                                            let fmt = Config::load()
+                                                .ok()
+                                                .and_then(|c| c.display_format.clone());
+                                            notification::notify_track(track, fmt.as_deref());
                                         }
-                                        let fmt = Config::load()
-                                            .ok()
-                                            .and_then(|c| c.display_format.clone());
-                                        notification::notify_track(track, fmt.as_deref());
                                     }
                                     format!("Queued {} tracks from: {}\n", files.len(), path_str)
                                 }