Merge branch 'master' into development

2018-06-25 20:45:53 +02:00
parent 6a81863e82 d85f8e5e57
commit 0dad737bbd
1 changed files with 1 additions and 1 deletions
--- a/photobooth/Photobooth.py
+++ b/photobooth/Photobooth.py
@@ -215,8 +215,8 @@ class Photobooth:

        logging.info('Photobooth triggered')

-        self._conn.send(GuiState.GreeterState())
        self.triggerOff()
+        self._conn.send(GuiState.GreeterState())

        self.setCameraActive()
        self.recvAck()