Merged revisions 65408 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65408 | bweschke | 2007-05-22 10:02:56 -0400 (Tue, 22 May 2007) | 3 lines

 Fix a problem with flag recognition.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65455 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_followme.c b/apps/app_followme.c
index 285fe767421462aec0398371019518ebe6ffd9df..2e313d012c80f910bb797488df0101c8324f9e7e 100644 (file)
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -981,13 +981,13 @@ static int app_exec(struct ast_channel *chan, void *data)
                }
                ast_mutex_unlock(&f->lock);
 
-               if (targs.followmeflags.flags & FOLLOWMEFLAG_STATUSMSG) 
+               if (ast_test_flag(&targs.followmeflags, FOLLOWMEFLAG_STATUSMSG)) 
                        ast_stream_and_wait(chan, targs.statusprompt, "");
 
                snprintf(namerecloc,sizeof(namerecloc),"%s/followme.%s",ast_config_AST_SPOOL_DIR,chan->uniqueid);
                duration = 5;
 
-               if (targs.followmeflags.flags & FOLLOWMEFLAG_RECORDNAME) 
+               if (ast_test_flag(&targs.followmeflags, FOLLOWMEFLAG_RECORDNAME)) 
                        if (ast_play_and_record(chan, "vm-rec-name", namerecloc, 5, "sln", &duration, 128, 0, NULL) < 0)
                                goto outrun;
 
@@ -1021,7 +1021,7 @@ static int app_exec(struct ast_channel *chan, void *data)
 
                if (targs.status != 100) {
                        ast_moh_stop(chan);
-                       if (targs.followmeflags.flags & FOLLOWMEFLAG_UNREACHABLEMSG) 
+                       if (ast_test_flag(&targs.followmeflags, FOLLOWMEFLAG_UNREACHABLEMSG)) 
                                ast_stream_and_wait(chan, targs.sorryprompt, "");
                        res = 0;
                } else {