[sword-svn] r2482 - trunk/src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2009-12-04 01:54:06 -0700 (Fri, 04 Dec 2009)
New Revision: 2482

Modified:
   trunk/src/mgr/curlftpt.cpp
   trunk/src/mgr/ftplibftpt.cpp
Log:
moved term check outside of statusReporter check.  If statusReporter is not
passed, we should still be able to term.


Modified: trunk/src/mgr/curlftpt.cpp
===================================================================
--- trunk/src/mgr/curlftpt.cpp	2009-12-04 08:50:59 UTC (rev 2481)
+++ trunk/src/mgr/curlftpt.cpp	2009-12-04 08:54:06 UTC (rev 2482)
@@ -84,8 +84,8 @@
 SWLog::getSystemLog()->logDebug("CURLFTPTransport report progress: totalSize: %ld; xfered: %ld\n", (long)dltotal, (long)dlnow);
 		if (pd->sr) {
 			pd->sr->statusUpdate(dltotal, dlnow);
-			if (*(pd->term)) return 1;
 		}
+		if (*(pd->term)) return 1;
 	}
 	return 0;
 }

Modified: trunk/src/mgr/ftplibftpt.cpp
===================================================================
--- trunk/src/mgr/ftplibftpt.cpp	2009-12-04 08:50:59 UTC (rev 2481)
+++ trunk/src/mgr/ftplibftpt.cpp	2009-12-04 08:54:06 UTC (rev 2482)
@@ -46,8 +46,8 @@
 SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered);
 		if (pd->sr) {
 			pd->sr->statusUpdate(pd->totalSize, xfered);
-			if (*(pd->term)) return 0;
 		}
+		if (*(pd->term)) return 0;
 	}
 	return 1;
 }