aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-09-28 15:36:55 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-09-28 15:36:55 +0200
commit5fb77a9739912c9a418b91cb2acfe54c3c88825d (patch)
tree99b7bfa1078712f6597dd70de83f1e692f50862b /src
parent8881b71079e86e5beb55a2a84ca2c0fc427f497a (diff)
fixed NPE when executing rename callback in muc
Diffstat (limited to 'src')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/MucOptions.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index cf49cf65e..cf078ee52 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -308,7 +308,9 @@ public class MucOptions {
this.error = ERROR_NO_ERROR;
self = user;
if (mNickChangingInProgress) {
- onRenameListener.onSuccess();
+ if (onRenameListener != null) {
+ onRenameListener.onSuccess();
+ }
mNickChangingInProgress = false;
} else if (this.onJoinListener != null) {
this.onJoinListener.onSuccess();