From f5932bf0704679e47d0a66729feb91404e2b900e Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 8 Apr 2018 17:26:39 +0200
Subject: [PATCH] deploy-ng: fix MAIN_DIR when running from outside the main
 directory

---
 dtool/src/prc/configPageManager.cxx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dtool/src/prc/configPageManager.cxx b/dtool/src/prc/configPageManager.cxx
index 2ad8f6596d..53f541cbd8 100644
--- a/dtool/src/prc/configPageManager.cxx
+++ b/dtool/src/prc/configPageManager.cxx
@@ -129,8 +129,14 @@ reload_implicit_pages() {
     blobinfo = nullptr;
   }
 
-  if (blobinfo != nullptr && blobinfo->num_pointers >= 11 && blobinfo->main_dir != nullptr) {
-    ExecutionEnvironment::shadow_environment_variable("MAIN_DIR", blobinfo->main_dir);
+  if (blobinfo != nullptr) {
+    if (blobinfo->num_pointers >= 11 && blobinfo->main_dir != nullptr) {
+      ExecutionEnvironment::set_environment_variable("MAIN_DIR", blobinfo->main_dir);
+    } else {
+      // Make sure that py_panda.cxx won't override MAIN_DIR.
+      ExecutionEnvironment::set_environment_variable("MAIN_DIR",
+        ExecutionEnvironment::get_environment_variable("MAIN_DIR"));
+    }
   }
 
   // PRC_PATTERNS lists one or more filename templates separated by spaces.