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

Merge pull request #40 from RetroShare/master

Browse source 
update to master
This commit is contained in:
defnax 2019-12-23 23:32:32 +01:00 • committed by GitHub
commit c4a71d21f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_scripts/OBS

@ -1 +1 @@
Subproject commit 9b74886eff7c948453d4c6afc621ffebc906a2a4 Subproject commit c064abd74b27e1cc440917e9dbac800316bb8470

5
retroshare-gui/src/gui/common/FriendListModel.cpp
View file

@ -178,12 +178,13 @@ int RsFriendListModel::rowCount(const QModelIndex& parent) const
return mGroups[index.group_index].child_profile_indices.size(); return mGroups[index.group_index].child_profile_indices.size();
if(index.type == ENTRY_TYPE_PROFILE) if(index.type == ENTRY_TYPE_PROFILE)
{
if(index.group_index < UNDEFINED_GROUP_INDEX_VALUE) if(index.group_index < UNDEFINED_GROUP_INDEX_VALUE)
return mProfiles[mGroups[index.group_index].child_profile_indices[index.profile_index]].child_node_indices.size(); return mProfiles[mGroups[index.group_index].child_profile_indices[index.profile_index]].child_node_indices.size();
else else
return mProfiles[index.profile_index].child_node_indices.size(); return mProfiles[index.profile_index].child_node_indices.size();
}
if(index.type == ENTRY_TYPE_NODE) else //if(index.type == ENTRY_TYPE_NODE)
return 0; return 0;
} }

1
retroshare-gui/src/gui/settings/WebuiPage.cpp
View file

@ -157,6 +157,7 @@ QString WebuiPage::helpText() const
webuiUrl.setScheme("http"); webuiUrl.setScheme("http");
webuiUrl.setHost(QString::fromStdString(rsJsonApi->getBindingAddress())); webuiUrl.setHost(QString::fromStdString(rsJsonApi->getBindingAddress()));
webuiUrl.setPort(rsJsonApi->listeningPort()); webuiUrl.setPort(rsJsonApi->listeningPort());
webuiUrl.setPath("/index.html");
QDesktopServices::openUrl(webuiUrl); QDesktopServices::openUrl(webuiUrl);
} }
else else