From dedf6c328a2141d55a53bf76db69811408f32d2c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 4 Dec 2015 14:07:16 +0100
Subject: use proposed nick as default nick in mucoptions

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

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

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 412f984fa..92254b906 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -246,7 +246,7 @@ public class MucOptions {
 	public MucOptions(Conversation conversation) {
 		this.account = conversation.getAccount();
 		this.conversation = conversation;
-		this.self = new User(this,conversation.getJid());
+		this.self = new User(this,createJoinJid(getProposedNick()));
 	}
 
 	public void updateFeatures(ArrayList<String> features) {
-- 
cgit v1.2.3