mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-16 09:03:51 -05:00
fix merge
This commit is contained in:
parent
3d2c1f5b2b
commit
c3bf06692e
1 changed files with 1 additions and 1 deletions
|
|
@ -1835,7 +1835,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ChatDialog* chatDialog = ChatDialog::getChat(chatId, Settings->getChatFlags());
|
ChatDialog* chatDialog = ChatDialog::getChat(chatId, (RsChatFlags)Settings->getChatFlags());
|
||||||
if (chatDialog) {
|
if (chatDialog) {
|
||||||
chatroomFound.append(link.name());
|
chatroomFound.append(link.name());
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue