fixed npe on rare occasion of show element in presence being null

2014-07-01 14:53:39 +02:00 · 2014-07-01 14:53:39 +02:00 · 6028bf4ee2
parent 2738d834b4
commit 6028bf4ee2
1 changed files with 1 additions and 1 deletions
--- a/src/eu/siacs/conversations/entities/Presences.java
+++ b/src/eu/siacs/conversations/entities/Presences.java
@ -44,7 +44,7 @@ public class Presences {
 	}

 	public static int parseShow(Element show) {
-		if (show == null) {
+		if ((show == null)||(show.getContent() == null)) {
 			return Presences.ONLINE;
 		} else if (show.getContent().equals("away")) {
 			return Presences.AWAY;