aboutsummaryrefslogtreecommitdiff
path: root/Logs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-29 14:14:57 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-29 14:14:57 -0400
commit93037580b61a17df5e6f849e206cbae0f0116e1b (patch)
tree6d1e320e0479aec7ac629ce2a04f0ab552c29d47 /Logs
parentc59ba80b5b49fb79f71dddde97e2f92959161f9b (diff)
fix resume button
Change alterTransferInfo to not merge in old values, including transferPaused.
Diffstat (limited to 'Logs')
-rw-r--r--Logs/Transfer.hs8
1 files changed, 0 insertions, 8 deletions
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index 46ca98403..642ee7ea1 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -214,14 +214,6 @@ readTransferInfo mpid s =
(bits, filebits) = splitAt 1 $ lines s
filename = join "\n" filebits
-{- Preserves the old transferTid and transferPaused values,
- - which are not written to disk. -}
-mergeTransferInfo :: TransferInfo -> TransferInfo -> TransferInfo
-mergeTransferInfo new old = new
- { transferTid = maybe (transferTid new) Just (transferTid old)
- , transferPaused = transferPaused new || transferPaused old
- }
-
parsePOSIXTime :: String -> Maybe POSIXTime
parsePOSIXTime s = utcTimeToPOSIXSeconds
<$> parseTime defaultTimeLocale "%s%Qs" s