Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 06:31:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some bugs in auto-activating saved chat rooms

Browse source
This commit is contained in:
csoler 2019-06-15 22:44:59 +02:00
parent c72b49c296
commit 5139c023ab
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
7 changed files with 50 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View file

@ -608,21 +608,15 @@ void ChatLobbyWidget::updateDisplay()
}
// In the new model (after lobby save to disk) the auto-subscribe flag is used to automatically join lobbies that where
// previously being used when the software quits.
// previously being used when the t software quits.
bool autoSubscribe = rsMsgs->getLobbyAutoSubscribe(lobby.lobby_id);
if (autoSubscribe && !subscribed)
if (autoSubscribe && subscribed && _lobby_infos.find(lobby.lobby_id) == _lobby_infos.end())
{
if(_lobby_infos.find(lobby.lobby_id) == _lobby_infos.end())
{
if (item == ui.lobbyTreeWidget->currentItem())
{
ChatDialog::chatFriend(ChatId(lobby.lobby_id)) ;
}else{
ChatDialog::chatFriend(ChatId(lobby.lobby_id),false) ;
}
}
ChatDialog *cd = ChatDialog::getChat(ChatId(lobby.lobby_id), RS_CHAT_OPEN);
addChatPage(dynamic_cast<ChatLobbyDialog*>(cd));
}
updateItem(ui.lobbyTreeWidget, item, lobby.lobby_id, lobby.lobby_name,lobby.lobby_topic, lobby.total_number_of_peers, subscribed, autoSubscribe,lobby_flags);
@ -689,7 +683,7 @@ void ChatLobbyWidget::updateDisplay()
if(it == _lobby_infos.end() && rsMsgs->joinVisibleChatLobby(lobby.lobby_id,lobby.gxs_id))
{
std::cerr << "Adding back ChatLobbyDialog for subscribed lobby " << std::hex << lobby.lobby_id << std::dec << std::endl;
ChatDialog::chatFriend(ChatId(lobby.lobby_id),false) ;
ChatDialog::chatFriend(ChatId(lobby.lobby_id),true) ;
}
}
publicSubLobbyItem->setHidden(publicSubLobbyItem->childCount()==0);