Merge branch 'aristocratos:main' into battery-power-2

src/btop_draw.cpp

@@ -1802,7 +1802,7 @@ namespace Proc {
 					p_counters[p.pid] = 0;
 				}
 				else if (p.cpu_p < 0.1 and ++p_counters[p.pid] >= 10) {
-					p_graphs.erase(p.pid);
+					if (p_graphs.contains(p.pid)) p_graphs.erase(p.pid);
 					p_counters.erase(p.pid);
 				}
 				else
@@ -1930,22 +1930,18 @@ namespace Proc {
 		//? Clear out left over graphs from dead processes at a regular interval
 		if (not data_same and ++counter >= 100) {
 			counter = 0;
-			for (auto element = p_graphs.begin(); element != p_graphs.end();) {
-				if (rng::find(plist, element->first, &proc_info::pid) == plist.end()) {
-					element = p_graphs.erase(element);
-					p_counters.erase(element->first);
-				}
-				else
-					++element;
-			}
 
-			for (auto element = p_wide_cmd.begin(); element != p_wide_cmd.end();) {
+			std::erase_if(p_graphs, [&](const auto& pair) {
-				if (rng::find(plist, element->first, &proc_info::pid) == plist.end()) {
+				return rng::find(plist, pair.first, &proc_info::pid) == plist.end();
-					element = p_wide_cmd.erase(element);
+			});
-				}
+
-				else
+			std::erase_if(p_counters, [&](const auto& pair) {
-					++element;
+				return rng::find(plist, pair.first, &proc_info::pid) == plist.end();
-			}
+			});
+
+			std::erase_if(p_wide_cmd, [&](const auto& pair) {
+				return rng::find(plist, pair.first, &proc_info::pid) == plist.end();
+			});
 		}
 
 		if (selected == 0 and selected_pid != 0) {

src/linux/btop_collect.cpp

@@ -995,12 +995,6 @@ namespace Gpu {
 			if (initialized) return false;
 
 			//? Dynamic loading & linking
-			nvml_dl_handle = dlopen("libnvidia-ml.so", RTLD_LAZY);
-			if (!nvml_dl_handle) {
-				Logger::info(std::string("Failed to load libnvidia-ml.so, NVIDIA GPUs will not be detected: ") + dlerror());
-				return false;
-			}
-
 			//? Try possible library names for libnvidia-ml.so
 			const array libNvAlts = {
 				"libnvidia-ml.so",