From 3172879b0e81af4066984d917cefe48f332c273d Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Fri, 20 Dec 2019 00:20:23 +0100 Subject: [PATCH 1/4] Update OBS submodule --- build_scripts/OBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/OBS b/build_scripts/OBS index 9b74886ef..5b968ee7b 160000 --- a/build_scripts/OBS +++ b/build_scripts/OBS @@ -1 +1 @@ -Subproject commit 9b74886eff7c948453d4c6afc621ffebc906a2a4 +Subproject commit 5b968ee7b5f96e4837ccb7c4e305ff9b94b05cfa From 63d879b3d990e7ea163fadb8ed05b0e8b993aaa2 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Sat, 21 Dec 2019 00:29:08 +0100 Subject: [PATCH 2/4] Update OBS submodule --- build_scripts/OBS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_scripts/OBS b/build_scripts/OBS index 5b968ee7b..c064abd74 160000 --- a/build_scripts/OBS +++ b/build_scripts/OBS @@ -1 +1 @@ -Subproject commit 5b968ee7b5f96e4837ccb7c4e305ff9b94b05cfa +Subproject commit c064abd74b27e1cc440917e9dbac800316bb8470 From 11bc7a886a54f450353ba0579e9280033f67b15f Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 21 Dec 2019 11:14:11 +0100 Subject: [PATCH 3/4] fixed cmpilation error, where impossible case is not handled --- retroshare-gui/src/gui/common/FriendListModel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp index d7d625121..3da609aa4 100644 --- a/retroshare-gui/src/gui/common/FriendListModel.cpp +++ b/retroshare-gui/src/gui/common/FriendListModel.cpp @@ -178,12 +178,13 @@ int RsFriendListModel::rowCount(const QModelIndex& parent) const return mGroups[index.group_index].child_profile_indices.size(); if(index.type == ENTRY_TYPE_PROFILE) + { if(index.group_index < UNDEFINED_GROUP_INDEX_VALUE) return mProfiles[mGroups[index.group_index].child_profile_indices[index.profile_index]].child_node_indices.size(); else return mProfiles[index.profile_index].child_node_indices.size(); - - if(index.type == ENTRY_TYPE_NODE) + } + else //if(index.type == ENTRY_TYPE_NODE) return 0; } From 71149935f9f29d4b84ab9610d1830bdef04369ef Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 21 Dec 2019 18:11:43 +0100 Subject: [PATCH 4/4] fixed path issue in calling webui from rs-gui --- retroshare-gui/src/gui/settings/WebuiPage.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp index 6595f1bd6..8bdc11146 100644 --- a/retroshare-gui/src/gui/settings/WebuiPage.cpp +++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp @@ -157,6 +157,7 @@ QString WebuiPage::helpText() const webuiUrl.setScheme("http"); webuiUrl.setHost(QString::fromStdString(rsJsonApi->getBindingAddress())); webuiUrl.setPort(rsJsonApi->listeningPort()); + webuiUrl.setPath("/index.html"); QDesktopServices::openUrl(webuiUrl); } else