[Asterisk-cvs] asterisk/apps app_zapscan.c,1.11,1.12

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv9818/apps

Modified Files:
	app_zapscan.c 
Log Message:
Fix locking in zapscan


Index: app_zapscan.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapscan.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- app_zapscan.c	4 Jun 2004 15:44:14 -0000	1.11
+++ app_zapscan.c	21 Jun 2004 04:08:54 -0000	1.12
@@ -72,10 +72,7 @@
 		ast_mutex_unlock(&c->lock);
 		c = ast_channel_walk_locked(c);
 	}
-	if (c)
-		return c;
-
-	return NULL;
+	return c;
 }
 
 static int careful_write(int fd, unsigned char *data, int len)
@@ -334,7 +331,8 @@
 				res = conf_run(chan, confno, confflags);
 				if (res<0) break;
 				input = res;
-			}
+			} else if (tempchan)
+				ast_mutex_unlock(&tempchan->lock);
 			lastchan = tempchan;
         }
         LOCAL_USER_REMOVE(u);