Merge branch 'debug-exploratory-PR' into debuggerHook-eval-arg

1 files changed, 4 insertions, 3 deletions

diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
index ee5102a6a..9cf2ff5e3 100644
--- a/src/libcmd/command.cc
+++ b/src/libcmd/command.cc
@@ -137,9 +137,10 @@ ref<EvalState> EvalCommand::getEvalState()
                 if (error)
                     printError("%s\n\n" ANSI_BOLD "Starting REPL to allow you to inspect the current state of the evaluator.\n" ANSI_NORMAL, error->what());
 
-                if (expr.staticEnv) {
-                    auto vm = mapStaticEnvBindings(evalState.symbols, *expr.staticEnv.get(), env);
-                    runRepl(*const_cast<EvalState*>(&evalState), *vm);
+                auto se = evalState->getStaticEnv(expr);
+                if (se) {
+                    auto vm = mapStaticEnvBindings(evalState->symbols, *se.get(), env);
+                    runRepl(evalState, *vm);
                 }
             };
     }