X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=4857f9bc60a5dece83b20a6be0ba205bd1f03c92;hp=b73fe3d4d273184223c4560944267b0abea719be;hb=6c6065477926396a7e70f000a1cbe222ecd65be4;hpb=bd5b8a466db2d9a15bb7f953caac489a402862fc

diff --git a/afs.c b/afs.c
index b73fe3d4..4857f9bc 100644
--- a/afs.c
+++ b/afs.c
@@ -37,22 +37,22 @@
 #include "sideband.h"
 #include "command.h"
 
-/** The osl tables used by afs. \sa blob.c. */
+/** The osl tables used by afs. \sa \ref blob.c. */
 enum afs_table_num {
-	/** Contains audio file information. See aft.c. */
+	/** Contains audio file information. See \ref aft.c. */
 	TBLNUM_AUDIO_FILES,
-	/** The table for the paraslash attributes. See attribute.c. */
+	/** The table for the paraslash attributes. See \ref attribute.c. */
 	TBLNUM_ATTRIBUTES,
 	/**
 	 * Paraslash's scoring system is based on Gaussian normal
 	 * distributions, and the relevant data is stored in the rbtrees of an
-	 * osl table containing only volatile columns.  See score.c for
+	 * osl table containing only volatile columns. See \ref score.c for
 	 * details.
 	 */
 	TBLNUM_SCORES,
 	/**
 	 * A standard blob table containing the mood definitions. For details
-	 * see mood.c.
+	 * see \ref mood.c.
 	 */
 	TBLNUM_MOODS,
 	/** A blob table containing lyrics on a per-song basis. */
@@ -130,7 +130,7 @@ extern uint32_t afs_socket_cookie;
  * command socket, so that the handler process can read the id, attach the
  * shared memory area and use the result.
  *
- * \sa struct callback_result.
+ * \sa \ref struct callback_result.
  */
 struct callback_query {
 	/** The function to be called. */
@@ -146,7 +146,7 @@ struct callback_query {
  * into the shared memory area holding the result, mainly to let the command
  * handler know the size of the result.
  *
- * \sa struct callback_query.
+ * \sa \ref struct callback_query.
  */
 struct callback_result {
 	/** The number of bytes of the result. */
@@ -432,7 +432,7 @@ static int pass_afd(int fd, char *buf, size_t size)
  *
  * \return Standard.
  *
- * \sa open_and_update_audio_file().
+ * \sa \ref open_and_update_audio_file().
  */
 static int open_next_audio_file(void)
 {
@@ -580,7 +580,7 @@ static int com_select_callback(struct afs_callback_arg *aca)
 		goto out;
 	/* ignore subsequent errors (but log them) */
 	para_printf(&aca->pbout, "could not activate %s\n", arg);
-	if (current_mop) {
+	if (current_mop && strcmp(current_mop, arg) != 0) {
 		int ret2;
 		para_printf(&aca->pbout, "switching back to %s\n", current_mop);
 		ret2 = activate_mood_or_playlist(current_mop, &num_admissible);
@@ -615,8 +615,13 @@ EXPORT_SERVER_CMD_HANDLER(select);
 
 static void init_admissible_files(const char *arg)
 {
-	if (activate_mood_or_playlist(arg, NULL) < 0)
+	int ret = activate_mood_or_playlist(arg, NULL);
+	if (ret < 0) {
+		assert(arg);
+		PARA_WARNING_LOG("could not activate %s: %s\n", arg,
+			para_strerror(-ret));
 		activate_mood_or_playlist(NULL, NULL); /* always successful */
+	}
 }
 
 static int setup_command_socket_or_die(void)