diff --git a/index.html b/index.html index f91edea3..be01f2ff 100755 --- a/index.html +++ b/index.html @@ -223,19 +223,6 @@ }, buttons: [ 'colvis', - { - text: ' Pull miner config', - className: 'btn-info', - enabled: false, - action: function () { - table.rows({selected: true}).eq(0).each(function (index) { - var row = table.row(index); - var data = row.data(); - - sendAction("PUBLISH_CONFIG", data.client_status.client_id); - }); - } - }, { text: ' Push miner config', className: 'btn-primary', @@ -249,6 +236,19 @@ }); } }, + { + text: ' Pull miner config', + className: 'btn-info', + enabled: false, + action: function () { + table.rows({selected: true}).eq(0).each(function (index) { + var row = table.row(index); + var data = row.data(); + + sendAction("PUBLISH_CONFIG", data.client_status.client_id); + }); + } + }, { text: ' Start miner', className: 'btn-success', diff --git a/src/backend/cpu/platform/HwlocCpuInfo.cpp b/src/backend/cpu/platform/HwlocCpuInfo.cpp index 70f76d3b..c064b18b 100644 --- a/src/backend/cpu/platform/HwlocCpuInfo.cpp +++ b/src/backend/cpu/platform/HwlocCpuInfo.cpp @@ -290,7 +290,7 @@ void xmrig::HwlocCpuInfo::processTopLevelCache(hwloc_obj_t cache, const Algorith } # endif - if (CnAlgo<>::base(algorithm) == Algorithm::CN_0 || CnAlgo<>::base(algorithm) == Algorithm::CN_1) { + if (algorithm == Algorithm::CN_CONCEAL) intensity = std::min(static_cast(cacheHashes / PUs), algorithm.maxIntensity()); } diff --git a/src/version.h b/src/version.h index 015603d0..1274a5ea 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ #define APP_ID "XMRigCC" #define APP_NAME "XMRigCC" #define APP_DESC "XMRigCC CPU miner" -#define APP_VERSION "2.1.0" +#define APP_VERSION "2.1.1" #define APP_DOMAIN "" #define APP_SITE "https://github.com/BenDr0id/xmrigCC/" #define APP_COPYRIGHT "Copyright (C) 2017- XMRigCC" @@ -36,7 +36,7 @@ #define APP_VER_MAJOR 2 #define APP_VER_MINOR 1 -#define APP_VER_PATCH 0 +#define APP_VER_PATCH 1 #ifndef NDEBUG #define BUILD_TYPE "DEBUG"