Merge pull request #8 from Panopto/Dev

Merge Dev branch to master
Panopto · Oct 21, 2016 · b5451ba · b5451ba
2 parents 3fad012 + 87fabe3
commit b5451ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/SyllabusPlusSchedulerService/PublicApiWrapper/RemoteRecorderManagementWrapper.cs b/SyllabusPlusSchedulerService/PublicApiWrapper/RemoteRecorderManagementWrapper.cs
@@ -108,7 +108,7 @@ private List<RecorderSettings> GetRecorderSettings(
                                         {
                                             RecorderId = primaryRemoteRecorderId,
                                             SuppressPrimary = false,
-                                            SuppressSecondary = true
+                                            SuppressSecondary = false
                                         }
                                      );
             }

diff --git a/SyllabusPlusSchedulerService/SchedulerService.cs b/SyllabusPlusSchedulerService/SchedulerService.cs
@@ -99,12 +99,10 @@ private void ScheduleRecordings()
                     {
                         schedule =
                             db.SchedulesTable.Select(s => s)
-                                .Where(s => !s.LastPanoptoSync.HasValue
-                                            || (s.LastUpdate > s.LastPanoptoSync.Value
-                                                && s.PanoptoSyncSuccess.HasValue && s.PanoptoSyncSuccess.Value)
-                                            || !s.PanoptoSyncSuccess.HasValue
-                                            || (!s.PanoptoSyncSuccess.Value
-                                                && s.NumberOfAttempts < MAX_ATTEMPTS))
+                                .Where(s => (s.NumberOfAttempts < MAX_ATTEMPTS 
+                                            && (!s.LastPanoptoSync.HasValue
+                                                || s.LastUpdate > s.LastPanoptoSync.Value
+                                                || !s.PanoptoSyncSuccess.HasValue)))
                               .OrderBy(s => s.LastUpdate).FirstOrDefault();
 
                         try