From f488b04bc7f5e232443078237ad562416c504cd3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 2 Oct 2005 17:14:47 +0000 Subject: [PATCH] remove implicit c:/cygwin, fix logic some more --- dtool/src/dtoolutil/filename.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dtool/src/dtoolutil/filename.cxx b/dtool/src/dtoolutil/filename.cxx index 5008c4a97e..fbd17886a2 100644 --- a/dtool/src/dtoolutil/filename.cxx +++ b/dtool/src/dtoolutil/filename.cxx @@ -133,12 +133,9 @@ get_panda_root() { const char *envvar = getenv("PANDA_ROOT"); if (envvar != (const char *)NULL) { panda_root = front_to_back_slash(envvar); - } else if (Filename("c:/cygwin").is_directory()) { - //setenv("PANDA_ROOT", "c:/cygwin", 1); - panda_root = "c:/cygwin"; } - if (!panda_root.empty() || panda_root[panda_root.length() - 1] != '\\') { + if (!panda_root.empty() && panda_root[panda_root.length() - 1] != '\\') { panda_root += '\\'; }