.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d88927bc593233740dc35a4e4fb0364370d10e7e..7e9e9c7d87366b79ce0634a85462a98f61b25385 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change beforePath="$PROJECT_DIR$/.docker/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/docker-compose.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.docker/dockerterminal.bat" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dockerterminal.bat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bin/updatedns.bat" beforeDir="false" afterPath="$PROJECT_DIR$/bin/updatedns.bat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/heartbeats.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/heartbeats.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -1300,7 +1295,7 @@
       <workItem from="1704215960754" duration="1064000" />
       <workItem from="1704879857290" duration="190000" />
       <workItem from="1707238767637" duration="1470000" />
-      <workItem from="1707311861067" duration="2556000" />
+      <workItem from="1707311861067" duration="4436000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1645,7 +1640,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="604" />
+    <option name="localTasksCounter" value="605" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 5e444bccc93f0bd2d1ffa50e9cee7a6779b0ee66..6b82d17fd93df0a5f7a380b25e582ccd13f9fd22 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -1031,7 +1031,7 @@ function wcOn($vmc = true)
     $hour = getHour();
     if (getNightMode('chambre') && getNightMode('bureau')) {
         $period = 'night';
-    } else if (getNightMode('chambre') && !getNightMode('bureau')) {
+    } else if (getNightMode() && !getNightMode('bureau')) {
         $period = 'silentmorning';
     } else if ($hour > 0 && $hour < 6.75) {
         $period = 'late';