fixed multi-session-nick renaming behaviour

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java
index 068e2f95b..77fd1189c 100644
--- a/src/main/java/de/pixart/messenger/entities/MucOptions.java
+++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java
@@ -332,7 +332,6 @@ public class MucOptions {
     private User self;
     private String subject = null;
     private String password = null;
-    public boolean mNickChangingInProgress = false;
 
     public MucOptions(Conversation conversation) {
         this.account = conversation.getAccount();
@@ -446,8 +445,10 @@ public class MucOptions {
             if (old != null) {
                 users.remove(old);
             }
+            boolean fullJidIsSelf = isOnline && user.getFullJid() != null && user.getFullJid().equals(self.getFullJid());
             if ((!membersOnly() || user.getAffiliation().ranks(Affiliation.MEMBER))
-                    && user.getAffiliation().outranks(Affiliation.OUTCAST)) {
+                    && user.getAffiliation().outranks(Affiliation.OUTCAST)
+                    && !fullJidIsSelf) {
                 this.users.add(user);
             }
         }