X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/6982880f199dda54b194408f5b4fb3c42c734e79..ec7109f36e878732d30e592279c2b160b28e6955:/disobedience/queue-menu.c

diff --git a/disobedience/queue-menu.c b/disobedience/queue-menu.c
index fcc34bf..5775ee3 100644
--- a/disobedience/queue-menu.c
+++ b/disobedience/queue-menu.c
@@ -81,9 +81,9 @@ int ql_scratch_sensitive(void attribute((unused)) *extra) {
 }
 
 static void ql_scratch_completed(void attribute((unused)) *v,
-                                 const char *error) {
-  if(error)
-    popup_protocol_error(0, error);
+                                 const char *err) {
+  if(err)
+    popup_protocol_error(0, err);
 }
 
 void ql_scratch_activate(GtkMenuItem attribute((unused)) *menuitem,
@@ -116,9 +116,9 @@ int ql_remove_sensitive(void *extra) {
 }
 
 static void ql_remove_completed(void attribute((unused)) *v,
-                                const char *error) {
-  if(error)
-    popup_protocol_error(0, error);
+                                const char *err) {
+  if(err)
+    popup_protocol_error(0, err);
 }
 
 static void ql_remove_activate_callback(GtkTreeModel *model,
@@ -127,7 +127,8 @@ static void ql_remove_activate_callback(GtkTreeModel *model,
                                         gpointer attribute((unused)) data) {
   struct queue_entry *q = ql_iter_to_q(model, iter);
 
-  disorder_eclient_remove(client, q->id, ql_remove_completed, q);
+  if(q != playing_track)
+    disorder_eclient_remove(client, q->id, ql_remove_completed, q);
 }
 
 void ql_remove_activate(GtkMenuItem attribute((unused)) *menuitem,
@@ -146,9 +147,9 @@ int ql_play_sensitive(void *extra) {
     && gtk_tree_selection_count_selected_rows(ql->selection) > 0;
 }
 
-static void ql_play_completed(void attribute((unused)) *v, const char *error) {
-  if(error)
-    popup_protocol_error(0, error);
+static void ql_play_completed(void attribute((unused)) *v, const char *err) {
+  if(err)
+    popup_protocol_error(0, err);
 }
 
 static void ql_play_activate_callback(GtkTreeModel *model,
@@ -186,7 +187,7 @@ gboolean ql_button_release(GtkWidget *widget,
 }
 
 struct tabtype *ql_tabtype(struct queuelike *ql) {
-  static const struct tabtype ql_tabtype = {
+  static const struct tabtype queuelike_tabtype = {
     ql_properties_sensitive,
     ql_selectall_sensitive,
     ql_selectnone_sensitive,
@@ -197,7 +198,7 @@ struct tabtype *ql_tabtype(struct queuelike *ql) {
     0
   };
 
-  ql->tabtype = ql_tabtype;
+  ql->tabtype = queuelike_tabtype;
   ql->tabtype.extra = ql;
   return &ql->tabtype;
 }