Fix: wizard script won't run

genielabs · Sep 29, 2018 · 828c027 · 828c027
1 parent 375700c
commit 828c027
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/BaseFiles/Common/html/index.html b/BaseFiles/Common/html/index.html
@@ -96,15 +96,15 @@
     <script src="js/jqm-datebox.lang.utf8.min.js"></script>
 
     <!-- HomeGenie Javascript includes -->
-    <script src="js/homegenie.api.js?version=r526"></script>
-    <script src="js/homegenie.webapp.js?version=r526"></script>
+    <script src="js/homegenie.api.js?version=v1.2-beta.8"></script>
+    <script src="js/homegenie.webapp.js?version=v1.2-beta.8"></script>
 
     <!-- custom javascript --><!-- TODO: check wheter this can be deprecated/moved -->
-    <script src="js/my.js?version=r526"></script>
+    <script src="js/my.js?version=v1.2-beta.7"></script>
 
     <!-- local css definitions and overrides -->
-    <link rel="stylesheet" href="css/my.css?version=r526" />
-    <link rel="stylesheet" href="css/fonts/hg-fonts.css?version=r526" />
+    <link rel="stylesheet" href="css/my.css?version=v1.2-beta.8" />
+    <link rel="stylesheet" href="css/fonts/hg-fonts.css?version=v1.2-beta.8" />
 
     <script type="text/javascript">
 

diff --git a/HomeGenie/Automation/Engines/WizardEngine.cs b/HomeGenie/Automation/Engines/WizardEngine.cs
@@ -46,18 +46,17 @@ public class WizardScript
 
             public WizardScript(ProgramBlock pb)
             {
-                if (!String.IsNullOrEmpty(pb.ScriptSource))
+                if (pb != null && !String.IsNullOrEmpty(pb.ScriptSource))
                 try
                 {
                     var s = JsonConvert.DeserializeObject<WizardScript>(pb.ScriptSource);
                     Commands = s.Commands;
                     Conditions = s.Conditions;
                     ConditionType = s.ConditionType;
-                    LastConditionEvaluationResult = false;
                 }
                 catch (Exception e)
                 {
-                    // TODO: report exception
+                    // TODO: report initialization exception
                 }
             }
         }
@@ -67,6 +66,7 @@ public WizardScript(ProgramBlock pb)
 
         public WizardEngine(ProgramBlock pb) : base(pb)
         {
+            script = new WizardScript(pb);
         }
 
         public WizardScript Script