fix ong script

diff --git a/ong.1.pl b/ong.1.pl
index 086b0d703697e28f4259b8b48223006ad421c571..31867b29cfb8960368475e6e762f4eee1b6f6a46 100644 (file)
--- a/ong.1.pl
+++ b/ong.1.pl
@@ -109,34 +109,41 @@ unless ($ongtime >= $next_ong) {
 $static_timer = int($settings{'ongtime'});
 $timer        = int($settings{'dynamicongtime'});
 $last         = int($settings{'last'});
-$frame        = int($state   {'last'})+1;
+$frame        = int($state   {'last'});
+
+if ($ongstate == STATE->{'ready'}) {
+       $frame += 1;
+       print 'next frame: '.$frame."\n";
+}
+else {
+       print 'not ready'."\n";
+}
 
 if (($timer > 0) && ($frame < $last)) {
        $timer = int($timer / ($last - $frame));
 }
 else {
-       $timer=0;
+       $timer = 1;
 }
-
 if ($static_timer > $timer) {
        $timer = $static_timer;
 }
 $next_ong = $ongtime + ($timer*3600);
+print 'next ongtime: '.$next_ong.' (+'.$timer.")\n";
 
 if ($ongstate == STATE->{'ready'}) {
-       print 'next frame: '.$frame."\n";
-       
        %default = read_default();
        %frame_data = read_frame_data($frame);
        # %goto_list = read_goto());
        
        %new_state = %state;
-       $new_state{'last'}   = $frame;
-       $new_state{'state'}  = 1;
-       $new_state{'ip1'}    = '';
-       $new_state{'ip2'}    = '';
-       $new_state{'ip3'}    = '';
-       $new_state{'ongtime'}= $timer;
+       $new_state{'last'}    = $frame;
+       $new_state{'state'}   = STATE->{'waiting'};
+       $new_state{'ip1'}     = '';
+       $new_state{'ip2'}     = '';
+       $new_state{'ip3'}     = '';
+       $new_state{'ongtime'} = $timer;
+       $new_state{'nextong'} = $next_ong;
        
        if ($frame >= 1) {
                %frame_1_data = read_frame_data($frame-1);
@@ -220,8 +227,6 @@ else {
        $update_state = 1;
 }
 if ($update_state) {
-       print 'not ready'."\n";
-       print 'next ongtime: '.$next_ong.' (+'.$timer.")\n";
        write_state($fh, \%state);
 }
 close ($fh);

diff --git a/settings.txt b/settings.txt
index 954f894b6f1233b1582fe20b99cde52603321ee1..b0a44338361c5be4eddb31305c8ecdb4fe174ce7 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-_version: 1.2.14
+_version: 1.2.15
 
 _SHEBANG: #!$0