.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4edd7b3696ac9eda51a24284114d8c95ea7080bd..e717bec4587ada9069354b773897739de5144adc 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -775,14 +775,7 @@
       <workItem from="1577298151244" duration="2270000" />
       <workItem from="1577358967357" duration="4847000" />
       <workItem from="1577378088885" duration="2201000" />
-      <workItem from="1577380387468" duration="184000" />
-    </task>
-    <task id="LOCAL-00209" summary=".">
-      <created>1566545980051</created>
-      <option name="number" value="00209" />
-      <option name="presentableId" value="LOCAL-00209" />
-      <option name="project" value="LOCAL" />
-      <updated>1566545980051</updated>
+      <workItem from="1577380387468" duration="711000" />
     </task>
     <task id="LOCAL-00210" summary=".">
       <created>1566546729894</created>
@@ -1120,7 +1113,14 @@
       <option name="project" value="LOCAL" />
       <updated>1577380217123</updated>
     </task>
-    <option name="localTasksCounter" value="258" />
+    <task id="LOCAL-00258" summary=".">
+      <created>1577380602449</created>
+      <option name="number" value="00258" />
+      <option name="presentableId" value="LOCAL-00258" />
+      <option name="project" value="LOCAL" />
+      <updated>1577380602449</updated>
+    </task>
+    <option name="localTasksCounter" value="259" />
     <servers />
   </component>
   <component name="TodoView">
@@ -1181,10 +1181,10 @@
     </state>
     <state x="720" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1577298128269" />
     <state x="960" y="247" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.2560.1040@0.0.2560.1040" timestamp="1576479992407" />
-    <state x="701" y="114" key="CommitChangelistDialog2" timestamp="1577380212160">
+    <state x="701" y="114" key="CommitChangelistDialog2" timestamp="1577380598743">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577380212160" />
+    <state x="701" y="114" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1577380598743" />
     <state x="701" y="127" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1575647157027" />
     <state x="935" y="114" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1576522977384" />
     <state x="836" y="443" key="NewPhpFileDialog" timestamp="1577363498855">

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index a0139dafc3702d22e1c94a6acc601aae1387aaba..5f5d67cf5b20ab4fbeb8db33daa4a4e0b4c67fd4 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -657,6 +657,11 @@ function execScene($name, $fromUserAction = false, $transitionTime = null)
         } else if ($action['type'] == 'ecomode') {
             ecoMode($action['mode']);
         } else if ($action['type'] == 'domoticz') {
+            if (isset($action['scene'])) {
+                $action['device'] = $action['scene'];
+                $action['switchtype'] = 'scene';
+            }
+
             domoticzSwitch($action['device'], $action['command'], isset($action['switchtype']) ? $action['switchtype'] : 'light', isset($action['priority']) && $action['priority']);
         } else if ($action['type'] == 'ir') {
             irsend($action['room'], $action['device'], $action['command']);