A few fixes.

crowbartools · May 31, 2017 · 0ff18fc · 0ff18fc
1 parent 178bbcd
commit 0ff18fc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/lib/interactive/handlers/changeSceneProcessor.js b/lib/interactive/handlers/changeSceneProcessor.js
@@ -8,7 +8,7 @@ function changeScene(effect, firebot){
         var scenes = firebot.scenes;
 
         // Loop through scenes
-        for (scene of scenes){
+        for (scene in scenes){
             var sceneData = scenes[scene];
             var groups = sceneData.default;
 

diff --git a/lib/interactive/mixer-interactive.js b/lib/interactive/mixer-interactive.js
@@ -46,7 +46,9 @@ function mixerConnect(){
 
             mixerClient.on('error', (err) => {
                 console.log('ERROR:', err);
-                renderWindow.webContents.send('error', err.message);
+                if(err.message !== ""){
+                    renderWindow.webContents.send('error', err.message);
+                }
             });
 
             mixerClient.state.on('participantJoin', participant => {
@@ -294,18 +296,20 @@ function changeGroups(participant, groupid){
 // Change Default Scene
 // This changes the default scene of a group to something else.
 function changeScenes(group, scene){
-    console.log('Changing '+group+' to '+scene+'.')
-    if(group == "default"){
-        mixerClient.updateGroups({
-            groups: [{groupID: 'default', sceneID: scene}]
-        })
-    } else {
-        var group = mixerClient.state.getGroup(group);
-        group.sceneID = scene;
+    if(group !== "None"){
+        console.log('Changing '+group+' to '+scene+'.')
+        if(group == "default"){
+            mixerClient.updateGroups({
+                groups: [{groupID: 'default', sceneID: scene}]
+            })
+        } else {
+            var group = mixerClient.state.getGroup(group);
+            group.sceneID = scene;
 
-        mixerClient.updateGroups({
-            groups: [group]
-        })
+            mixerClient.updateGroups({
+                groups: [group]
+            })
+        }
     }
 }
 

diff --git a/main.js b/main.js
@@ -78,6 +78,8 @@ function createWindow () {
   process.on('uncaughtException', function(error) {
       // Handle the error
       console.error(error);
+      // Log Event
+      renderWindow.webContents.send('error', 'Unhandled error. Double check your board settings.');
   });
 
   // When Quittin.