Fixed minor bugs

3 files changed, 8 insertions, 3 deletions

diff --git a/src/data.c b/src/data.c
index d8768b9..6525f56 100644
--- a/src/data.c
+++ b/src/data.c
@@ -490,6 +490,9 @@ track_rm(struct track *track, bool sync_fs)
 	/* remove from player queue */
 	link_pop(&track->link_pq);
 
+	/* remove from player history */
+	link_pop(&track->link_hs);
+
 	/* remove the reference as last used track */
 	if (player.track == track)
 		player.track = NULL;
@@ -517,8 +520,8 @@ aquire_lock(const char *datadir)
 			return false;
 		}
 
-		fread(linebuf, 1, sizeof(linebuf), file);
-		pid = atoi(linebuf);
+		fgets(linebuf, sizeof(linebuf), file);
+		pid = strtol(linebuf, NULL, 10);
 		procpath = aprintf("/proc/%i", pid);
 		OOM_CHECK(procpath);
 		if (path_exists(procpath)) {
diff --git a/src/player_mpd.c b/src/player_mpd.c
index 62acbdb..1cd46fb 100644
--- a/src/player_mpd.c
+++ b/src/player_mpd.c
@@ -363,6 +363,7 @@ player_update(void)
 
 	current_song = mpd_run_current_song(mpd.conn);
 	if (current_song) {
+		free(player.track_name);
 		player.track_name = mpd_loaded_track_name(current_song);
 		OOM_CHECK(player.track_name);
 		player.loaded = true;
diff --git a/src/tui.c b/src/tui.c
index 03cbc1b..a1a6300 100644
--- a/src/tui.c
+++ b/src/tui.c
@@ -504,7 +504,8 @@ delete_selected_track(void)
 	link = list_at(tracks_vis, track_nav.sel);
 	ASSERT(link != NULL);
 	track = tracks_vis_track(link);
-	track_rm(track, true);
+	if (!track_rm(track, true))
+		CMD_SET_STATUS("Failed to remove track");
 }
 
 bool