dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-01 10:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: move file watcher cleanup to correct finally block

Browse source
This commit is contained in:
Paul Gauthier 2024-10-25 12:52:39 -07:00 • committed by Paul Gauthier (aider)
parent c16224b37a
commit 923d9a0df2
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
aider/io.py
View file

@ -447,6 +447,12 @@ class InputOutput:
except UnicodeEncodeError as err: except UnicodeEncodeError as err:
self.tool_error(str(err)) self.tool_error(str(err))
return "" return ""
finally:
# Clean up the watcher thread
stop_event.set()
watcher.join(timeout=1.0) # Wait up to 1 second for thread to finish
if watcher.is_alive():
self.tool_warning("Warning: File watcher thread did not shut down cleanly")
if line and line[0] == "{" and not multiline_input: if line and line[0] == "{" and not multiline_input:
multiline_input = True multiline_input = True
@ -465,12 +471,6 @@ class InputOutput:
self.user_input(inp) self.user_input(inp)
return inp return inp
finally:
# Clean up the watcher thread
stop_event.set()
watcher.join(timeout=1.0) # Wait up to 1 second for thread to finish
if watcher.is_alive():
self.tool_warning("Warning: File watcher thread did not shut down cleanly")
def add_to_input_history(self, inp): def add_to_input_history(self, inp):
if not self.input_history_file: if not self.input_history_file: