Merge pull request #979 from PhenomRetroShare/Fix_LobbyAutoSubscribe

Fix Lobby auto-subscribe.
RetroShare · Aug 3, 2017 · 4e02c5f · 4e02c5f
2 parents 4b820a0 + 27bedf8
commit 4e02c5f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/libretroshare/src/chat/distributedchat.cc b/libretroshare/src/chat/distributedchat.cc
@@ -577,14 +577,18 @@ void DistributedChatService::handleRecvChatLobbyList(RsChatLobbyListItem *item)
 		}
 
 		RsIdentityDetails idd ;
-		if(IS_PGP_SIGNED_LOBBY(flags)
-		   && (!rsIdentity->getIdDetails(gxsId,idd)
-		       || !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) )
+		if(!rsIdentity->getIdDetails(gxsId,idd))
+			std::cerr << "(EE) Lobby auto-subscribe: Can't get Id detail for:" << gxsId.toStdString().c_str() << std::endl;
+		else
 		{
-			std::cerr << "(EE) Attempt to auto-subscribe to signed lobby with non signed Id. Remove it." << std::endl;
-			setLobbyAutoSubscribe(*it, false);
-		} else {
-			joinVisibleChatLobby(*it,gxsId);
+			if(IS_PGP_SIGNED_LOBBY(flags)
+			   && !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) )
+			{
+				std::cerr << "(EE) Attempt to auto-subscribe to signed lobby with non signed Id. Remove it." << std::endl;
+				setLobbyAutoSubscribe(*it, false);
+			} else {
+				joinVisibleChatLobby(*it,gxsId);
+			}
 		}
 	}