Reconcile branches

* cmus/master (cmus/cmus@d0a685d) * gavtroy/flat-library-view (gavtroy/cmus@7697e0a) * gavtroy/cmdline-cursor-context (gavtroy/cmus@bcff68b) * gavtroy/gapless-mp4 (gavtroy/cmus@26c73fb) * gavtroy/part-is-disc (gavtroy/cmus@2b7b8d5) * gavtroy/resume-pl (gavtroy/cmus@ab16c5b) * adeason/fix-view-segv (adeason/cmus@40f42d5) * pgaskin/aaudio (d9db94d) * pgaskin/configure-fn-check (3de76fa) * pgaskin/configure-cppflags (1c85444) * pgaskin/configure-ncurses-cflags (c561a17) * pgaskin/ip-mad-double-close (30b9194)
pgaskin · Aug 6, 2024 · 91ad600 · 91ad600
13 parents 7379b1d + d0a685d + 7697e0a + bcff68b + 26c73fb + 2b7b8d5 + ab16c5b + 40f42d5 + d9db94d + 3de76fa + 1c85444 + c561a17 + 30b9194
commit 91ad600
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ip/mad.c b/ip/mad.c
@@ -54,8 +54,11 @@ static off_t lseek_func(void *datasource, off_t offset, int whence)
 static int close_func(void *datasource)
 {
 	struct input_plugin_data *ip_data = datasource;
+	int rc;
 
-	return close(ip_data->fd);
+	rc = ip_data->fd != -1 ? close(ip_data->fd) : 0;
+	ip_data->fd = -1;
+	return rc;
 }
 
 static struct nomad_callbacks callbacks = {