summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_bookmarks.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/JabberG/src/jabber_bookmarks.cpp')
-rw-r--r--protocols/JabberG/src/jabber_bookmarks.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index 80d0eeeec4..ca922e5b24 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -343,11 +343,8 @@ void CJabberDlgBookmarks::OpenBookmark()
if (item->nick && *item->nick)
m_proto->GroupchatJoinRoom(server, room, item->nick, item->password);
- else {
- TCHAR *nick = JabberNickFromJID(m_proto->m_szJabberJID);
- m_proto->GroupchatJoinRoom(server, room, nick, item->password);
- mir_free(nick);
- }
+ else
+ m_proto->GroupchatJoinRoom(server, room, ptrT(JabberNickFromJID(m_proto->m_szJabberJID)), item->password);
}
}
else CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)item->jid);