Merge branch 'aristocratos:main' into add-netbsd-support

aristocratos · Feb 18, 2024 · c70ca20 · c70ca20
2 parents 3545de6 + cf60917
commit c70ca20
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,6 @@ if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 endif()
 
 project("btop"
-  VERSION 1.3.0
   DESCRIPTION "A monitor of resources"
   HOMEPAGE_URL "https://github.com/aristocratos/btop"
   LANGUAGES CXX

diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp
@@ -835,7 +835,7 @@ namespace Cpu {
 		if (b.use_power) {
 			if (not b.power_now.empty()) {
 				try {
-					watts = (float)stoll(readfile(b.energy_now, "-1")) / 1000000.0;
+					watts = (float)stoll(readfile(b.power_now, "-1")) / 1000000.0;
 				}
 				catch (const std::invalid_argument&) { }
 				catch (const std::out_of_range&) { }