From 116bc0d0b228877f0b8e26a0d5945c0dfb288910 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Tue, 28 Jan 2020 01:12:17 +0000 Subject: [PATCH] Fixed logic derp --- common/build.rs | 2 +- common/src/assets/watch.rs | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/build.rs b/common/build.rs index 385f9ef7d7..44d7aed036 100644 --- a/common/build.rs +++ b/common/build.rs @@ -36,7 +36,7 @@ fn main() { Err(e) => panic!("failed to retrieve current git commit hash: {}", e), } // Check if git-lfs is working - if std::env::var("DISABLE_GIT_LFS_CHECK").is_err() || cfg!(not(feature = "no-assets")) { + if std::env::var("DISABLE_GIT_LFS_CHECK").is_err() && cfg!(not(feature = "no-assets")) { let asset_path: PathBuf = ["..", "assets", "voxygen", "background", "bg_main.png"] .iter() .collect(); diff --git a/common/src/assets/watch.rs b/common/src/assets/watch.rs index d1d7b4787f..91f3b3ddad 100644 --- a/common/src/assets/watch.rs +++ b/common/src/assets/watch.rs @@ -57,10 +57,6 @@ impl Watcher { } } fn handle_event(&mut self, event: Event) { - // Skip notice events - //if let Some(Flag::Notice) = event.flag() { - // return; - //} if let Event { kind: EventKind::Modify(_), paths,