Changeset 10143

Timestamp:

Feb 8, 2010, 7:21:07 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #2874 "Since 10094 The Schedule Speed Limit Not Working" -- fixed regression reported by bebbo

File:

• trunk/libtransmission/session.c (modified) (5 diffs)

trunk/libtransmission/session.c

@@ -627 +627 @@
 }
 
-static void turtleBootstrap( tr_session *, struct tr_turtle_info *, tr_bool isEnabled );
+static void turtleBootstrap( tr_session *, struct tr_turtle_info * );
 
 static void
@@ -779 +779 @@
     if( tr_bencDictFindBool( settings, TR_PREFS_KEY_ALT_SPEED_TIME_ENABLED, &boolVal ) )
         turtle->isClockEnabled = boolVal;
-
-    if( !tr_bencDictFindBool( settings, TR_PREFS_KEY_ALT_SPEED_ENABLED, &boolVal ) )
-        boolVal = FALSE;
-    turtleBootstrap( session, turtle, boolVal );
+    turtleBootstrap( session, turtle );
 
     data->done = TRUE;
@@ -1154 +1151 @@
 }
 
-static tr_bool
-turtleTestClock( struct tr_turtle_info * t, tr_bool * enabled )
-{
-    tr_bool hit;
-
-    if(( hit = ( t->testedAt < t->_nextChangeAt ) && ( t->_nextChangeAt <= tr_time( ))))
-        *enabled = t->_nextChangeValue;
-
-    return hit;
-}
-
 static void
 turtleCheckClock( tr_session * session, struct tr_turtle_info * t, tr_bool byUser )
 {
-    tr_bool enabled;
     const time_t now = tr_time( );
-    const tr_bool hit = turtleTestClock( t, &enabled );
+    const tr_bool hit = ( t->testedAt < t->_nextChangeAt ) && ( t->_nextChangeAt <= tr_time( ));
 
     t->testedAt = now;
@@ -1176 +1161 @@
     if( hit )
     {
+        const tr_bool enabled = t->_nextChangeValue;
+
         if( t->isClockEnabled && t->_nextChangeAllowed )
         {
@@ -1190 +1177 @@
  * and turns on turtle mode if the clock settings say to. */
 static void
-turtleBootstrap( tr_session * session, struct tr_turtle_info * turtle, tr_bool isEnabled )
-{
+turtleBootstrap( tr_session * session, struct tr_turtle_info * turtle )
+{
+    tr_bool isEnabled;
+
     turtleFindNextChange( turtle );
-
-    if( !isEnabled )
-        turtleTestClock( turtle, &isEnabled );
-
+    isEnabled = turtle->isClockEnabled && !turtle->_nextChangeValue;
     useAltSpeed( session, turtle, isEnabled, FALSE );
 }