Skip to content

Commit ae6dd93

Browse files
authored
Merge pull request #5080 from myk002/myk_short_term_avert_deadlock
temporarily neuter implementation of try_autocomplete
2 parents e1ae82d + e75ce39 commit ae6dd93

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

library/Core.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,10 @@ void get_commands(color_ostream &con, std::vector<std::string> &commands) {
459459
static bool try_autocomplete(color_ostream &con, const std::string &first, std::string &completed)
460460
{
461461
std::vector<std::string> commands, possible;
462-
get_commands(con, commands);
462+
463+
// restore call to get_commands once we have updated the core lock to a deferred lock
464+
// so calling Lua from the console thread won't deadlock if Lua is currently busy
465+
//get_commands(con, commands);
463466
for (auto &command : commands)
464467
if (command.substr(0, first.size()) == first)
465468
possible.push_back(command);

0 commit comments

Comments
 (0)