From c68df41aae53443162bf10d2ff0e72300fdb9611 Mon Sep 17 00:00:00 2001 From: Clemens Elflein Date: Fri, 27 Mar 2020 11:23:50 +0100 Subject: [PATCH] added transition for situations where the camera was not able to trigger correctly (focus not found mainly) --- src/logic/BoothLogic.cpp | 1 + src/ui/BoothGui.h | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/logic/BoothLogic.cpp b/src/logic/BoothLogic.cpp index c599822..036cb58 100644 --- a/src/logic/BoothLogic.cpp +++ b/src/logic/BoothLogic.cpp @@ -701,6 +701,7 @@ FILTER BoothLogic::getFilter() { case 1: return BASIC_FILTER; } + return NO_FILTER; } bool BoothLogic::isStopped() { diff --git a/src/ui/BoothGui.h b/src/ui/BoothGui.h index fcf29aa..1fbf185 100644 --- a/src/ui/BoothGui.h +++ b/src/ui/BoothGui.h @@ -174,7 +174,13 @@ namespace selfomat { } void notifyPreviewIncoming() override { - setState(STATE_TRANS_PRINT_PREV1); + if(currentState == STATE_BLACK) { + // We're before the final image but we get a new preview - there seems to be an error. + // Go fade to live + setState(STATE_TRANS_PREV2_PREV3); + } else { + setState(STATE_TRANS_PRINT_PREV1); + } } void showAgreement() override;