Skip to content

Commit e59a4b8

Browse files
authored
Merge pull request #49 from JeffLIrion/close-socket
Close socket on failure
2 parents dc08097 + 6eec381 commit e59a4b8

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

ppadb/connection.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def connect(self):
3535
try:
3636
self.socket.connect((self.host, self.port))
3737
except socket.error as e:
38+
self.close()
3839
raise RuntimeError("ERROR: connecting to {}:{} {}.\nIs adb running on your computer?".format(
3940
self.host,
4041
self.port,
@@ -44,8 +45,14 @@ def connect(self):
4445
return self.socket
4546

4647
def close(self):
48+
if not self.socket:
49+
return
50+
4751
logger.debug("Connection closed...")
48-
self.socket.close()
52+
try:
53+
self.socket.close()
54+
except OSError:
55+
pass
4956

5057
##############################################################################################################
5158
#

0 commit comments

Comments
 (0)