Changeset 38317

Timestamp:

08/24/16 14:39:56 (7 years ago)

Author:

obi

Message:

add rec check before onlineupdate

Location:

titan/titan

Files:

• global.h (modified) (1 diff)
• header.h (modified) (1 diff)
• titan.c (modified) (2 diffs)

titan/titan/global.h

@@ -7628 +7628 @@
 }
 
+int checkshutdown(int flag)
+{
+        int i = 0;
+
+        //check if record running
+        if((flag == 1 || flag == 2 || flag == 3 || flag == 4 || flag == 5) && (status.streaming > 0 || status.recording > 0 || getrectimerbytimediff(300) != NULL))
+        {
+                if(flag == 4 && status.fixpowerofftime > 1)
+                {
+                                status.fixpowerofftime = time(NULL) + 900; //check powerofftimer again in 15min
+                                return 1;
+                }
+                if(flag == 5 && status.sd_timer != NULL && status.sd_timer->active)
+                {
+                                status.sd_timer->shutdown_time = time(NULL) + 900; //check powerofftimer again in 15min
+                                return 1;
+                }
+
+                if(textbox(_("Message"), _("Found running record\nor record is starting in next time.\nReally shutdown ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 15, 0) != 1)
+                        return 1;
+        }
+
+        //check if download is running
+        for(i = 0; i < MAXBGDOWNLOAD; i++)
+        {
+                if(bgdownload[i] != NULL && bgdownload[i]->ret == -1)
+                {
+                        if(textbox(_("Message"), _("Found running download\nReally shutdown ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 15, 0) != 1)
+                                return 1;
+                        break;
+                }
+        }
+        
+        return 0;
+}
+
 #endif

titan/titan/header.h

@@ -589 +589 @@
 struct rectimer* addrectimernode(char* line, struct rectimer* last);
 int checkrectimerconflict(struct rectimer* recnode);
+struct rectimer* getrectimerbytimediff(time_t timediff);
 
 //dvb.h

titan/titan/titan.c

@@ -249 +249 @@
 #endif
 
-#define TIMECODE "1469471993"
+#define TIMECODE "1472042241"
 
 // mipsel start
@@ -330 +330 @@
                 timeshiftstop(3);
 
-        //check if record running
-        if((flag == 1 || flag == 2 || flag == 3 || flag == 4 || flag == 5) && (status.streaming > 0 || status.recording > 0 || getrectimerbytimediff(300) != NULL))
-        {
-                if(flag == 4 && status.fixpowerofftime > 1)
-                {
-                                status.fixpowerofftime = time(NULL) + 900; //check powerofftimer again in 15min
-                                return;
-                }
-                if(flag == 5 && status.sd_timer != NULL && status.sd_timer->active)
-                {
-                                status.sd_timer->shutdown_time = time(NULL) + 900; //check powerofftimer again in 15min
-                                return;
-                }
-
-                if(textbox(_("Message"), _("Found running record\nor record is starting in next time.\nReally shutdown ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 15, 0) != 1)
-                        return;
-        }
-
-        //check if download is running
-        for(i = 0; i < MAXBGDOWNLOAD; i++)
-        {
-                if(bgdownload[i] != NULL && bgdownload[i]->ret == -1)
-                {
-                        if(textbox(_("Message"), _("Found running download\nReally shutdown ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 15, 0) != 1)
-                                return;
-                        break;
-                }
-        }
+        ret = checkshutdown(flag);
+        if(ret == 1) return;
 
         ret = servicestop(status.aktservice, 1, 1);