mirror of https://github.com/aristocratos/btop.git
Compare commits
7 Commits
bd25f0141c
...
106e7b1da7
Author | SHA1 | Date |
---|---|---|
Nathan | 106e7b1da7 | |
Jakob P. Liljenberg | ac62ba9de1 | |
Jakob P. Liljenberg | 3f917c0412 | |
Andrea Jemmett | 0127e8b3cd | |
Jos Dehaes | ebc86e9702 | |
Nathan Crapo | e5a9728e23 | |
Nathan Crapo | b904097c6a |
|
@ -143,6 +143,7 @@ target_link_libraries(btop Threads::Threads)
|
|||
# Enable GPU support
|
||||
if(LINUX AND BTOP_GPU)
|
||||
target_compile_definitions(btop PRIVATE GPU_SUPPORT)
|
||||
target_link_libraries(btop dl)
|
||||
|
||||
if(BTOP_RSMI_STATIC)
|
||||
# ROCm doesn't properly add it's folders to the module path if `CMAKE_MODULE_PATH` is already
|
||||
|
|
|
@ -381,11 +381,16 @@ namespace Theme {
|
|||
if (themefile.good()) {
|
||||
Logger::debug("Loading theme file: " + filename);
|
||||
while (not themefile.bad()) {
|
||||
if (themefile.peek() == '#') {
|
||||
themefile.ignore(SSmax, '\n');
|
||||
continue;
|
||||
}
|
||||
themefile.ignore(SSmax, '[');
|
||||
if (themefile.eof()) break;
|
||||
string name, value;
|
||||
getline(themefile, name, ']');
|
||||
if (not Default_theme.contains(name)) {
|
||||
themefile.ignore(SSmax, '\n');
|
||||
continue;
|
||||
}
|
||||
themefile.ignore(SSmax, '=');
|
||||
|
@ -394,6 +399,7 @@ namespace Theme {
|
|||
if (themefile.peek() == '"') {
|
||||
themefile.ignore(1);
|
||||
getline(themefile, value, '"');
|
||||
themefile.ignore(SSmax, '\n');
|
||||
}
|
||||
else getline(themefile, value, '\n');
|
||||
|
||||
|
|
|
@ -448,7 +448,7 @@ namespace Cpu {
|
|||
const int file_id = atoi(file.path().filename().c_str() + 4); // skip "temp" prefix
|
||||
string file_path = file.path();
|
||||
|
||||
if (!s_contains(file_path, file_suffix)) {
|
||||
if (!s_contains(file_path, file_suffix) or s_contains(file_path, "nvme")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue