aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/entities/MucOptions.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-11 15:44:22 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-11 15:44:22 +0100
commit0d516b060354f577ff52ce2d3bb73f56557b87d1 (patch)
treeb77371f78047f4dcae10a8402c4ba00085cbae68 /src/eu/siacs/conversations/entities/MucOptions.java
parent08023210ba875f3cd088eca2b4b3df7410966344 (diff)
ping stuff
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/entities/MucOptions.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/MucOptions.java b/src/eu/siacs/conversations/entities/MucOptions.java
index 3ea7f4f65..9bc6fb210 100644
--- a/src/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/eu/siacs/conversations/entities/MucOptions.java
@@ -144,7 +144,11 @@ public class MucOptions {
if (split.length == 2) {
return split[1];
} else {
- return conversation.getAccount().getUsername();
+ if (conversation.getAccount()!=null) {
+ return conversation.getAccount().getUsername();
+ } else {
+ return null;
+ }
}
}