Merge pull request #7944 from yorickvP/fix-curRepl

NixRepl::mainLoop: restore old curRepl on function exit
NixOS · Apr 4, 2023 · d93c151 · d93c151
2 parents 523c3f7 + 5bb6e3b
commit d93c151
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc
@@ -252,7 +252,9 @@ void NixRepl::mainLoop()
     el_hist_size = 1000;
 #endif
     read_history(historyFile.c_str());
+    auto oldRepl = curRepl;
     curRepl = this;
+    Finally restoreRepl([&] { curRepl = oldRepl; });
 #ifndef READLINE
     rl_set_complete_func(completionCallback);
     rl_set_list_possib_func(listPossibleCallback);