Set jid/nick/passw for mucjoindlg after it was fully initialized

This avoids accidental data change on account/favorites updates

Author: Ri0n

src/conferencebookmark.cpp

@@ -34,7 +34,7 @@ ConferenceBookmark::ConferenceBookmark(const QString &name, const XMPP::Jid &jid
 {
 }
 
-ConferenceBookmark::ConferenceBookmark(const QDomElement &el) : auto_join_(Never) { fromXml(el); }
+ConferenceBookmark::ConferenceBookmark(const QDomElement &el) { fromXml(el); }
 
 QStringList ConferenceBookmark::joinTypeNames()
 {

src/psiaccount.cpp

@@ -3547,12 +3547,11 @@ void PsiAccount::actionJoin(const ConferenceBookmark &bookmark, bool connectImme
 #ifdef GROUPCHAT
     MUCJoinDlg *w = new MUCJoinDlg(psi(), this);
 
+    if (reason != MucAutoJoin || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool())
+        w->show();
     w->setJid(bookmark.jid());
     w->setNick(bookmark.nick().isEmpty() ? JIDUtil::nickOrJid(this->nick(), d->jid.node()) : bookmark.nick());
     w->setPassword(bookmark.password());
-
-    if (reason != MucAutoJoin || !PsiOptions::instance()->getOption("options.ui.muc.hide-on-autojoin").toBool())
-        w->show();
     if (connectImmediately) {
         w->doJoin(reason);
     }