felix/photobooth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Further error handling changes

Browse Source
This commit is contained in:
Balthasar Reuter
2018-04-18 00:04:45 +02:00
parent e296d7997c
commit f3ad5bc7ff
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
photobooth/Photobooth.py
View File

@@ -83,6 +83,14 @@ class Photobooth:
except RuntimeError as e:
print('Camera error: ' + str(e))
self._send.send( gui.ErrorState('Camera error', str(e)) )
event = recv.recv()
if str(event) == 'cancel':
return 1
elif str(event) == 'ack':
pass
else:
print('Unknown event received: ' + str(event))
raise RuntimeError('Unknown event received', str(event))
return 0

3
photobooth/gui/PyQt5Gui.py
View File

@@ -123,7 +123,8 @@ class PyQt5Gui(Gui):
self._transport.send('ack')
self._lastState()
else:
self.close()
self._transport.send('cancel')
self.showStart()
class PyQt5Receiver(QThread):

10
photobooth/main.py
View File

@@ -38,9 +38,13 @@ def main_photobooth(config, send, recv):
except BaseException as e:
send.send( gui.ErrorState('Camera error', str(e)) )
event = recv.recv()
if str(event) != 'ack':
print('Unknown event received: ' + str(event))
raise RuntimeError('Unknown event received', str(event))
if str(event) == 'cancel':
return 1
elif str(event) == 'ack':
pass
else:
print('Unknown event received: ' + str(event))
raise RuntimeError('Unknown event received', str(event))
def run(argv):