From 8e200cd8b031225e13a309359142ec4442f772a0 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 18 Feb 2019 12:28:02 -0800 Subject: Prevent crashing when cleaning up file, if file is still in use --- onionshare/onionshare.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py index 32e56ba0..551b8314 100644 --- a/onionshare/onionshare.py +++ b/onionshare/onionshare.py @@ -95,10 +95,14 @@ class OnionShare(object): """ self.common.log('OnionShare', 'cleanup') - # cleanup files - for filename in self.cleanup_filenames: - if os.path.isfile(filename): - os.remove(filename) - elif os.path.isdir(filename): - shutil.rmtree(filename) + # Cleanup files + try: + for filename in self.cleanup_filenames: + if os.path.isfile(filename): + os.remove(filename) + elif os.path.isdir(filename): + shutil.rmtree(filename) + except: + # Don't crash if file is still in use + pass self.cleanup_filenames = [] -- cgit v1.2.3-54-g00ecf