From 505ed5e43b37fcb3d46997bbfa296fc28c19acaa Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Thu, 1 Aug 2019 01:56:18 -0500
Subject: [PATCH] Fix crash when the shell takes too long to start when reading
 the environment

According to https://docs.python.org/3/library/subprocess.html#subprocess.Popen.wait, `wait()` throws a `TimeoutExpired` exception when the process is not done after the timeout. I noticed this because kitty crashed for me.
The old code looks like it's trying to wait as long as it takes for the process to finish, which is what I implemented.
---
 kitty/main.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kitty/main.py b/kitty/main.py
index 5c42dae1a..faf659528 100644
--- a/kitty/main.py
+++ b/kitty/main.py
@@ -213,9 +213,16 @@ def read_shell_environment(opts=None):
         p = subprocess.Popen(shell + ['-l', '-c', 'env'], stdout=slave, stdin=slave, stderr=slave, start_new_session=True, close_fds=True)
         with os.fdopen(master, 'rb') as stdout, os.fdopen(slave, 'wb'):
             raw = b''
-            while p.wait(0.01) is None:
+            from subprocess import TimeoutExpired
+            while True:
+                try:
+                    ret = p.wait(0.01)
+                except TimeoutExpired:
+                    ret = None
                 with suppress(Exception):
                     raw += stdout.read()
+                if ret is not None:
+                    break
             if p.returncode == 0:
                 while True:
                     try: