mirror of
https://github.com/aristocratos/btop.git
synced 2024-06-10 22:44:48 +12:00
Fix crash when no nvidia GPU is detected
This commit is contained in:
parent
0e0025a2c3
commit
2d27f2ff61
|
@ -537,7 +537,7 @@ namespace Runner {
|
|||
if (Global::debug) debug_timer("gpu", draw_begin);
|
||||
|
||||
//? Draw box
|
||||
if (not pause_output) output += Gpu::draw(gpu, conf.force_redraw, conf.no_update);
|
||||
if (not pause_output and Gpu::Nvml::initialized) output += Gpu::draw(gpu, conf.force_redraw, conf.no_update);
|
||||
|
||||
if (Global::debug) debug_timer("gpu", draw_done);
|
||||
}
|
||||
|
|
|
@ -1742,7 +1742,7 @@ namespace Draw {
|
|||
Cpu::redraw = Gpu::redraw = Mem::redraw = Net::redraw = Proc::redraw = true;
|
||||
|
||||
Cpu::shown = s_contains(boxes, "cpu");
|
||||
Gpu::shown = s_contains(boxes, "gpu");
|
||||
Gpu::shown = s_contains(boxes, "gpu") and Gpu::Nvml::initialized;
|
||||
Mem::shown = s_contains(boxes, "mem");
|
||||
Net::shown = s_contains(boxes, "net");
|
||||
Proc::shown = s_contains(boxes, "proc");
|
||||
|
|
|
@ -103,7 +103,7 @@ namespace Term {
|
|||
bool mem = boxes.find("mem") != string::npos;
|
||||
bool net = boxes.find("net") != string::npos;
|
||||
bool proc = boxes.find("proc") != string::npos;
|
||||
bool gpu = boxes.find("gpu") != string::npos;
|
||||
bool gpu = boxes.find("gpu") != string::npos and Gpu::Nvml::initialized;
|
||||
int width = 0;
|
||||
if (mem) width = Mem::min_width;
|
||||
else if (net) width = Mem::min_width;
|
||||
|
|
Loading…
Reference in a new issue