capture error feedback

timelapseplus · Dec 7, 2016 · 9c48974 · 9c48974
1 parent 2203c30
commit 9c48974
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/interface/ui.js b/interface/ui.js
@@ -290,7 +290,7 @@ exports.confirmationPrompt = function(promptText, optionText1, optionText2, help
                         callback1(cb);
                     } else {
                         back();
-                        cb();
+                        //cb();
                     }
                 }
             }
@@ -305,7 +305,7 @@ exports.confirmationPrompt = function(promptText, optionText1, optionText2, help
                         callback2(cb);
                     } else {
                         back();
-                        cb();
+                        //cb();
                     }
                 }
             }

diff --git a/intervalometer/intervalometer.js b/intervalometer/intervalometer.js
@@ -253,6 +253,8 @@ function runPhoto() {
                     //writeFile();
                     intervalometer.emit("status", status);
                     console.log("program status:", status);
+                } else {
+                    intervalometer.emit('error', "An error occurred during capture.  This could mean that the camera body is not supported or possibly an issue with the cable disconnecting.\nThe time-lapse will attempt to continue anyway.\nSystem message: ", err);
                 }
                 if (intervalometer.status.framesRemaining < 1 || status.running == false) {
                     clearTimeout(timerHandle);
@@ -306,6 +308,8 @@ function runPhoto() {
                             writeFile();
                             intervalometer.emit("status", status);
                             console.log("program status:", status);
+                        } else {
+                            intervalometer.emit('error', "An error occurred during capture.  This could mean that the camera body is not supported or possibly an issue with the cable disconnecting.\nThe time-lapse will attempt to continue anyway.\nSystem message: ", err);
                         }
                         if ((intervalometer.currentProgram.intervalMode == "fixed" && intervalometer.status.framesRemaining < 1) || status.running == false) {
                             clearTimeout(timerHandle);
@@ -570,7 +574,7 @@ intervalometer.getRecentTimelapseClips = function(count, callback) {
                 setTimeout(function(){
                     //console.log("clips:", clips);
                     clips = clips.sort(function(a, b){
-                        return a.name < b.name;
+                        return a.index < b.index;
                     });
                     callback(null, clips); 
                 });
-Original file line number
+Diff line change
@@ Expand Up @@
                             callback1(cb);
                         } else {
                             back();
-                            cb();
+                            //cb();
                         }
                     }
                 }
@@ Expand All @@
                             callback2(cb);
                         } else {
                             back();
-                            cb();
+                            //cb();
                         }
                     }
                 }
@@ Expand Down @@