Merge branch 'master' into development

2018-06-25 20:45:53 +02:00
commit 0dad737bbd
@@ -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()