From: Matt O'Gorman <mogorman@digium.com>
Date: Thu, 1 Jun 2006 18:48:22 +0000 (+0000)
Subject: more minor fixes thanks Julian on pointing out
X-Git-Tag: 1.4.0-beta1~1111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa339925dc123ccb2602eb35cfe2fe92e57c2668;p=thirdparty%2Fasterisk.git

more minor fixes thanks Julian on pointing out
potential problems


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

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 71a60552d5..dde2ecdef2 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -342,9 +342,7 @@ static int aji_status_exec(struct ast_channel *chan, void *data)
 		if (!strcasecmp(iterator->user, screenname)) {
 			found = 1; 
 			r = iterator->resources; 
-			if (!r) {	/* client hasnt signed on */
-				break;
-			} else {
+			if (r) {	/* client has signed on */
 				if (resource) {
 					while (r) {
 						if (!strcasecmp(r->resource, resource)) {
@@ -353,7 +351,9 @@ static int aji_status_exec(struct ast_channel *chan, void *data)
 						}
 						r = r->next;
 					}
+					if(stat != 7) break;
 					ast_log(LOG_WARNING, "Resource not found %s\n", resource);
+					break;
 				} else {
 					stat = r->status; 
 					break;