diff --git a/src/Mod/AddonManager/AddonManagerOptions.ui b/src/Mod/AddonManager/AddonManagerOptions.ui index 8d4ecb45e9..8eb3575c98 100644 --- a/src/Mod/AddonManager/AddonManagerOptions.ui +++ b/src/Mod/AddonManager/AddonManagerOptions.ui @@ -112,7 +112,7 @@ installed addons will be checked for available updates Hide Addons with non-FSF Free/Libre license - true + false HideNonFSFFreeLibre diff --git a/src/Mod/AddonManager/NetworkManager.py b/src/Mod/AddonManager/NetworkManager.py index 89531ff4ee..2970d8a3aa 100644 --- a/src/Mod/AddonManager/NetworkManager.py +++ b/src/Mod/AddonManager/NetworkManager.py @@ -502,7 +502,6 @@ if HAVE_QTNETWORK: current_index = index break - sender.abort() if current_index != -1: self.__launch_request(current_index, self.__create_get_request(url, timeout_ms)) @@ -579,7 +578,7 @@ if HAVE_QTNETWORK: return response_code = reply.attribute(QtNetwork.QNetworkRequest.HttpStatusCodeAttribute) - if response_code == 301: # Permanently moved -- this is a redirect, bail out + if response_code == 301 or response_code == 302: # This is a redirect, bail out return if reply.error() != QtNetwork.QNetworkReply.NetworkError.OperationCanceledError: # It this was not a timeout, make sure we mark the queue task done diff --git a/src/Mod/AddonManager/package_list.py b/src/Mod/AddonManager/package_list.py index 8d8f8a07a8..d7a4a128eb 100644 --- a/src/Mod/AddonManager/package_list.py +++ b/src/Mod/AddonManager/package_list.py @@ -93,9 +93,9 @@ class PackageList(QtWidgets.QWidget): self.set_view_style(style) self.ui.view_bar.view_selector.set_current_view(style) - self.item_filter.setHidePy2(pref.GetBool("HidePy2", True)) - self.item_filter.setHideObsolete(pref.GetBool("HideObsolete", True)) - self.item_filter.setHideNonOSIApproved(pref.GetBool("HideNonOSIApproved", True)) + self.item_filter.setHidePy2(pref.GetBool("HidePy2", False)) + self.item_filter.setHideObsolete(pref.GetBool("HideObsolete", False)) + self.item_filter.setHideNonOSIApproved(pref.GetBool("HideNonOSIApproved", False)) self.item_filter.setHideNonFSFLibre(pref.GetBool("HideNonFSFFreeLibre", False)) self.item_filter.setHideNewerFreeCADRequired( pref.GetBool("HideNewerFreeCADRequired", False)