summaryrefslogtreecommitdiffstats
path: root/src/options.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/options.rs')
-rw-r--r--src/options.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/options.rs b/src/options.rs
index 86d44e75..95c780f6 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -747,14 +747,6 @@ fn get_default_widget_and_count(
fn get_use_battery(matches: &ArgMatches, config: &Config) -> bool {
#[cfg(feature = "battery")]
{
- if matches.get_flag("battery") {
- return true;
- } else if let Some(flags) = &config.flags {
- if let Some(battery) = flags.battery {
- return battery;
- }
- }
-
if let Ok(battery_manager) = Manager::new() {
if let Ok(batteries) = battery_manager.batteries() {
if batteries.count() == 0 {
@@ -762,6 +754,14 @@ fn get_use_battery(matches: &ArgMatches, config: &Config) -> bool {
}
}
}
+
+ if matches.get_flag("battery") {
+ return true;
+ } else if let Some(flags) = &config.flags {
+ if let Some(battery) = flags.battery {
+ return battery;
+ }
+ }
}
false