Skip to content

Commit a9c2fab

Browse files
committed
fixes
1 parent 7915092 commit a9c2fab

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

crates/pet-windows-registry/src/environments.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ fn get_registry_pythons_from_key_for_company(
122122

123123
// Possible this is a conda install folder.
124124
if is_conda_env(&env_path) {
125-
conda_locator.find_and_report(reporter, &env_path);
125+
if let Some(reporter) = reporter {
126+
conda_locator.find_and_report(reporter, &env_path);
127+
}
126128
continue;
127129
}
128130

@@ -186,7 +188,9 @@ fn get_registry_pythons_from_key_for_company(
186188
})
187189
.build();
188190

189-
reporter.report_environment(&env);
191+
if let Some(reporter) = reporter {
192+
reporter.report_environment(&env);
193+
}
190194
environments.push(env);
191195
}
192196
Err(err) => {

crates/pet-windows-registry/src/lib.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,23 @@ impl WindowsRegistry {
3636
return Some(result);
3737
}
3838

39-
let registry_result = get_registry_pythons(&self.conda_locator, &reporter)?;
40-
result.replace(registry_result);
39+
if let Some(registry_result) = get_registry_pythons(&self.conda_locator, &reporter) {
40+
result.replace(registry_result);
41+
} else {
42+
result.replace(LocatorResult {
43+
managers: vec![],
44+
environments: vec![],
45+
});
46+
}
4147

4248
Some(registry_result)
4349
}
4450
#[cfg(windows)]
4551
fn clear(&self) {
4652
use std::sync::atomic::Ordering;
4753

48-
self.searched.store(false, Ordering::Relaxed);
49-
if let Ok(mut envs) = self.environments.write() {
50-
envs.clear();
51-
}
54+
let mut search_result = self.search_result.lock().unwrap();
55+
search_result.take();
5256
}
5357
}
5458

0 commit comments

Comments
 (0)