diff --git a/Application/src/tracker/misc/default_config.cpp b/Application/src/tracker/misc/default_config.cpp index 49920bc0edb1c90b557403427d920202b121095d..71934ae2251c0b5e830705c6cd0b66b74f7e87aa 100644 --- a/Application/src/tracker/misc/default_config.cpp +++ b/Application/src/tracker/misc/default_config.cpp @@ -122,8 +122,8 @@ file::Path conda_environment_path() { home = file::Path(home).remove_filename().str(); #endif - if(home != "CONDA_PREFIX" && home != "" && home != compiled_path) { - Debug("Reset conda prefix '%S' / '%S'", &home, &compiled_path); + if(home == "CONDA_PREFIX" || home == "" || home == compiled_path) { + Debug("Reset conda prefix '%S' / '%S'", &home, &compiled_path); auto conda_prefix = getenv("CONDA_PREFIX"); if(conda_prefix) { diff --git a/README.md b/README.md index c87d65dc12d073a36ffa6ed44fc1ac110a61db4b..439f12554fbdb8271a587092af1e27b89622f6c2 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,11 @@ TRex can track 256 individuals in real-time, or up to 128 with all fancy feature Create a new virtual conda environment on macOS/Windows, using: ``` -conda create -n tracking -c trexing trex # macOS, Windows +conda create -n tracking -c trexing trex # macOS, Windows ``` or, add the `conda-forge` channel for Linux: ``` -conda create -n tracking -c conda-forge -c trexing trex # Linux +conda create -n tracking -c main -c conda-forge -c trexing trex # Linux ``` If you want compatibility with the Basler API (or other things with licensing/portability issues), please @@ -36,10 +36,6 @@ If you have any issues running the software please consult the documentation fir and if this does not solve your problem, please file an issue using the [issue tracker](https://github.com/mooch443/trex/issues) here on github. If you experience problems with [Tensorflow](https://tensorflow.org), such as installing CUDA or cuDNN dependencies, then please direct issues to those development teams. -# Example data - -See https://trex.run/docs/examples.html. - # License Released under the GPLv3 License (see [LICENSE](https://github.com/mooch443/trex/blob/master/LICENSE)).