fix: enable flags.enable_gpu by default

ClementTsang · Aug 13, 2024 · 289075c · 289075c
1 parent d9d9e1d
commit 289075c
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/options.rs b/src/options.rs
@@ -806,19 +806,20 @@ fn get_use_battery(args: &BottomArgs, config: &Config) -> bool {
     false
 }
 
-#[allow(unused_variables)]
+#[cfg(feature = "gpu")]
 fn get_enable_gpu(args: &BottomArgs, config: &Config) -> bool {
-    #[cfg(feature = "gpu")]
-    {
-        if args.gpu.enable_gpu {
-            return true;
-        } else if let Some(flags) = &config.flags {
-            if let Some(enable_gpu) = flags.enable_gpu {
-                return enable_gpu;
-            }
-        }
+    if args.gpu.enable_gpu {
+        return true;
     }
+    config
+        .flags
+        .as_ref()
+        .and_then(|f| f.enable_gpu)
+        .unwrap_or(false)
+}
 
+#[cfg(not(feature = "gpu"))]
+fn get_enable_gpu(_: &BottomArgs, _: &Config) -> bool {
     false
 }