Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug causing GUI to not auto-unsubscribe in circles

Browse Source
This commit is contained in:
csoler 2016-03-16 23:30:23 -04:00
parent a2a9079380
commit 36edde6d25
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -378,7 +378,13 @@ void IdDialog::loadCircleGroupMeta(const uint32_t &token)
++vit ; ++vit ;
continue ; continue ;
} }
if(!subscribed && !admin && item->parent() != mExternalOtherCircleItem)
{
std::cerr << " Existing group is not in subscribed items although it is subscribed. Removing." << std::endl;
delete item ;
++vit ;
continue ;
}
// the item is at the right place. Just remove it from the list of items to add. // the item is at the right place. Just remove it from the list of items to add.
std::cerr << " item already in place. Removing from list." << std::endl; std::cerr << " item already in place. Removing from list." << std::endl;
vit = groupInfo.erase(vit) ; vit = groupInfo.erase(vit) ;

1
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -57,6 +57,7 @@
/***** /*****
* #define NOTIFY_DEBUG * #define NOTIFY_DEBUG
****/ ****/
#define NOTIFY_DEBUG
/*static*/ NotifyQt *NotifyQt::_instance = NULL; /*static*/ NotifyQt *NotifyQt::_instance = NULL;
/*static*/ bool NotifyQt::_disableAllToaster = false; /*static*/ bool NotifyQt::_disableAllToaster = false;

2
retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp
View File

@ -43,6 +43,8 @@ RsGxsUpdateBroadcast *RsGxsUpdateBroadcast::get(RsGxsIfaceHelper *ifaceImpl)
void RsGxsUpdateBroadcast::onChangesReceived(const RsGxsChanges& changes) void RsGxsUpdateBroadcast::onChangesReceived(const RsGxsChanges& changes)
{ {
std::cerr << "onChangesReceived()" << std::endl;
if(changes.mService != mIfaceImpl->getTokenService()) if(changes.mService != mIfaceImpl->getTokenService())
return; return;