From 5fb77a9739912c9a418b91cb2acfe54c3c88825d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 28 Sep 2015 15:36:55 +0200
Subject: fixed NPE when executing rename callback in muc

---
 src/main/java/eu/siacs/conversations/entities/MucOptions.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs')

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();
-- 
cgit v1.2.3