Fix tag_rename selection

2 files changed, 6 insertions, 3 deletions

diff --git a/src/data.c b/src/data.c
index c819421..1ba1147 100644
--- a/src/data.c
+++ b/src/data.c
@@ -626,7 +626,10 @@ acquire_lock(const char *datadir)
 	}
 
 	file = fopen(lockpath, "w+");
-	if (file == NULL) return false;
+	if (file == NULL) {
+		free(lockpath);
+		return false;
+	}
 	snprintf(linebuf, sizeof(linebuf), "%i", getpid());
 	fputs(linebuf, file);
 	fclose(file);
@@ -668,7 +671,7 @@ data_load(void)
 	if (!datadir) ERRORX(USER, "TMUS_DATA not set");
 
 	if (!acquire_lock(datadir))
-		ERRORX(USER, "Data directory in use");
+		ERRORX(USER, "Failed to lock datadir");
 
 	dir = opendir(datadir);
 	if (!dir) ERROR(SYSTEM, "opendir %s", datadir);
diff --git a/src/tui.c b/src/tui.c
index a6a8f7e..d4085e6 100644
--- a/src/tui.c
+++ b/src/tui.c
@@ -294,7 +294,7 @@ rename_current_tag(void)
 	struct tag *tag;
 	char *cmd;
 
-	link = list_at(&tags, track_nav.sel);
+	link = list_at(&tags, tag_nav.sel);
 	if (!link) return false;
 	tag = UPCAST(link, struct tag, link);