filter.c: Handle filter errors gracefully.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index d9461bb7617aaca1c56b7709c6326e0924966562..58b04a8bafce749308aefe17d42ebaf178d4d45b 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -75,6 +75,7 @@ struct command_task {
        struct task task;
 };
 
        struct task task;
 };
 

+extern int mmd_mutex;

 extern struct misc_meta_data *mmd;
 
 static int server_socket;
 extern struct misc_meta_data *mmd;
 
 static int server_socket;


@@ -571,15 +572,15 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
                free(current_mop);
                if (arg) {
                        current_mop = para_strdup(arg);
                free(current_mop);
                if (arg) {
                        current_mop = para_strdup(arg);

-                       mmd_lock();
+                       mutex_lock(mmd_mutex);

                        strncpy(mmd->afs_mode_string, arg,
                                sizeof(mmd->afs_mode_string));
                        mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
                        strncpy(mmd->afs_mode_string, arg,
                                sizeof(mmd->afs_mode_string));
                        mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';

-                       mmd_unlock();
+                       mutex_unlock(mmd_mutex);

                } else {
                } else {

-                       mmd_lock();
+                       mutex_lock(mmd_mutex);

                        strcpy(mmd->afs_mode_string, "dummy");
                        strcpy(mmd->afs_mode_string, "dummy");

-                       mmd_unlock();
+                       mutex_unlock(mmd_mutex);

                        current_mop = NULL;
                }
        }
                        current_mop = NULL;
                }
        }