From 592d55ef7c4647b77c4e70d9e9353522a900a0b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Oct 2012 14:51:11 -0400 Subject: [PATCH] fix display of transfers for remotes not in syncRemotes list --- Assistant/Threads/TransferWatcher.hs | 4 ++-- doc/design/assistant/webapp.mdwn | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index 95a594d5db..a54128cb67 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -67,8 +67,8 @@ onAdd st dstatus _ file _ = case parseTransferFile file of [ "transfer starting:" , show t ] - r <- headMaybe . filter (sameuuid t) . syncRemotes - <$> getDaemonStatus dstatus + r <- headMaybe . filter (sameuuid t) + <$> runThreadState st Remote.remoteList updateTransferInfo dstatus t info { transferRemote = r } sameuuid t r = Remote.uuid r == transferUUID t diff --git a/doc/design/assistant/webapp.mdwn b/doc/design/assistant/webapp.mdwn index 106e7b1f62..a5a970fd1f 100644 --- a/doc/design/assistant/webapp.mdwn +++ b/doc/design/assistant/webapp.mdwn @@ -8,9 +8,6 @@ The webapp is a web server that displays a shiny interface. This is quite likely because of how the div containing transfers is refereshed. If instead javascript was used to update the progress bar etc for transfers with json data, the buttons would work better. -* Transfers from a remote with syncing disabled show as from "unknown". - (Note that it's probably not practical to prevent a remote with syncing - disabled from initiating transfers, so this can happen.) ## interface