From 469d6ff29ebc8bed44458695186d57bfed0edb6c Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: ćšć, 20 5æ 2021 13:51:10 +0800 Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager into develop --- src/library/hw_identifier/hw_identifier_facade.cpp | 4 ++-- src/library/os/windows/network.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/library/hw_identifier/hw_identifier_facade.cpp b/src/library/hw_identifier/hw_identifier_facade.cpp index 193dfab..83b6ba2 100644 --- a/src/library/hw_identifier/hw_identifier_facade.cpp +++ b/src/library/hw_identifier/hw_identifier_facade.cpp @@ -21,10 +21,10 @@ using namespace std; LCC_EVENT_TYPE HwIdentifierFacade::validate_pc_signature(const std::string& str_code) { - HwIdentifier pc_id(str_code); - LCC_API_HW_IDENTIFICATION_STRATEGY id_strategy = pc_id.get_identification_strategy(); LCC_EVENT_TYPE result = IDENTIFIERS_MISMATCH; try { + HwIdentifier pc_id(str_code); + LCC_API_HW_IDENTIFICATION_STRATEGY id_strategy = pc_id.get_identification_strategy(); unique_ptr<IdentificationStrategy> strategy = IdentificationStrategy::get_strategy(id_strategy); result = strategy->validate_identifier(pc_id); } catch (logic_error& e) { diff --git a/src/library/os/windows/network.cpp b/src/library/os/windows/network.cpp index ad8c5ab..db0fed9 100644 --- a/src/library/os/windows/network.cpp +++ b/src/library/os/windows/network.cpp @@ -73,7 +73,7 @@ return score; } -bool cmp(const OsAdapterInfo &a, const OsAdapterInfo &b) { return score(a) >= score(b); } +bool cmp(const OsAdapterInfo &a, const OsAdapterInfo &b) { return score(a) > score(b); } /** * * @param adapterInfos -- Gitblit v1.9.1