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

Fixes for visState -> vs_disc & vs_dht.

Browse source 
Added RTT Gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-09-29 07:10:19 +00:00
parent 90aa57a0f0
commit ba157e4891
15 changed files with 644 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

24
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -171,9 +171,9 @@ void ServerPage::load()
*/
netIndex = 3; // NONE.
if (detail.visState & RS_VS_DHT_ON)
if (detail.vs_dht != RS_VS_DISC_OFF)
{
if (detail.visState & RS_VS_DISC_ON)
if (detail.vs_disc != RS_VS_DISC_OFF)
{
netIndex = 0; // PUBLIC
}
@ -184,7 +184,7 @@ void ServerPage::load()
}
else
{
if (detail.visState & RS_VS_DISC_ON)
if (detail.vs_disc != RS_VS_DISC_OFF)
{
netIndex = 1; // PRIVATE
}
@ -342,26 +342,32 @@ void ServerPage::saveAddresses()
if (detail.netMode != netMode)
rsPeers->setNetworkMode(ownId, netMode);
uint32_t visState = 0;
uint16_t vs_disc = 0;
uint16_t vs_dht = 0;
/* Check if vis has changed */
switch(ui.discComboBox->currentIndex())
{
case 0:
visState |= (RS_VS_DISC_ON | RS_VS_DHT_ON);
vs_disc = RS_VS_DISC_FULL;
vs_dht = RS_VS_DHT_FULL;
break;
case 1:
visState |= RS_VS_DISC_ON;
vs_disc = RS_VS_DISC_FULL;
vs_dht = RS_VS_DHT_OFF;
break;
case 2:
visState |= RS_VS_DHT_ON;
vs_disc = RS_VS_DISC_OFF;
vs_dht = RS_VS_DHT_FULL;
break;
case 3:
default:
vs_disc = RS_VS_DISC_OFF;
vs_dht = RS_VS_DHT_OFF;
break;
}
if (visState != detail.visState)
rsPeers->setVisState(ownId, visState);
if ((vs_disc != detail.vs_disc) || (vs_dht != detail.vs_dht))
rsPeers->setVisState(ownId, vs_disc, vs_dht);
if (0 != netIndex)
saveAddr = true;