From 7513c3470ec8ed5735849081b512463a172dd6c3 Mon Sep 17 00:00:00 2001
From: Marko Oldenburg <leongaultier@gmail.com>
Date: Tue, 28 May 2019 08:39:52 +0200
Subject: [PATCH] fix bug then IsWe or IsWeTomorrow

---
 73_AutoShuttersControl.pm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/73_AutoShuttersControl.pm b/73_AutoShuttersControl.pm
index a8a0a48..c473a90 100644
--- a/73_AutoShuttersControl.pm
+++ b/73_AutoShuttersControl.pm
@@ -3130,8 +3130,7 @@ sub ShuttersSunrise($$) {
             {
                 if ( not IsWeTomorrow() ) {
                     if (
-                        IsWe()
-                        and int( gettimeofday() / 86400 ) == int(
+                        int( gettimeofday() / 86400 ) == int(
                             computeAlignTime( '24:00',
                                 $shutters->getTimeUpWeHoliday ) / 86400
                         )
@@ -3146,11 +3145,12 @@ sub ShuttersSunrise($$) {
                             computeAlignTime( '24:00',
                                 $shutters->getTimeUpEarly ) / 86400
                         )
+                        and $shutters->getSunrise
                       )
                     {
                         $shuttersSunriseUnixtime =
                           computeAlignTime( '24:00',
-                            $shutters->getTimeUpWeHoliday );
+                            $shutters->getTimeUpEarly ) + 86400;
                     }
                     else {
                         $shuttersSunriseUnixtime =
@@ -3182,6 +3182,17 @@ sub ShuttersSunrise($$) {
                           computeAlignTime( '24:00',
                             $shutters->getTimeUpEarly );
                     }
+                    elsif (
+                        int( gettimeofday() / 86400 ) != int(
+                            computeAlignTime( '24:00',
+                                $shutters->getTimeUpWeHoliday ) / 86400
+                        )
+                      )
+                    {
+                        $shuttersSunriseUnixtime =
+                          computeAlignTime( '24:00',
+                            $shutters->getTimeUpWeHoliday );
+                    }
                     else {
                         $shuttersSunriseUnixtime =
                           computeAlignTime( '24:00',