summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorseebye <seebye@users.noreply.github.com>2018-10-25 17:38:38 +0200
committerseebye <seebye@users.noreply.github.com>2018-10-25 17:38:38 +0200
commit588c1856de9d91b64dde53034387770f5b7b9a22 (patch)
tree8cb01f9275b2aad0c46e5526701f5f590b33bcd5
parent161e3ec39602788d3336e7982ed6edf915ddb7a1 (diff)
downloadranger-588c1856de9d91b64dde53034387770f5b7b9a22.tar.gz
ueberzug: end ueberzug by directly sending SIGTERM, fallback to SIGKILL
-rw-r--r--ranger/ext/img_display.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/ranger/ext/img_display.py b/ranger/ext/img_display.py
index eeddd609..2d5b20a0 100644
--- a/ranger/ext/img_display.py
+++ b/ranger/ext/img_display.py
@@ -719,15 +719,11 @@ class UeberzugImageDisplayer(ImageDisplayer):
             self._execute(action='remove', identifier=self.IMAGE_ID)
 
     def quit(self):
-        if (self.is_initialized and self.process.poll() is None
-                and not self.process.stdin.closed):
-            timer_term = threading.Timer(1, self.process.terminate, [])
-            timer_kill = threading.Timer(2, self.process.kill, [])
-            self.process.stdin.close()
+        if self.is_initialized and self.process.poll() is None:
+            timer_kill = threading.Timer(1, self.process.kill, [])
             try:
-                timer_term.start()
+                self.process.terminate()
                 timer_kill.start()
                 self.process.communicate()
             finally:
-                timer_term.cancel()
                 timer_kill.cancel()