From fa6080faeaf5a8516e7e69d81381f44a3aa97b8f Mon Sep 17 00:00:00 2001
From: Kenneth Skovhede <kenneth@hexad.dk>
Date: Thu, 22 Mar 2018 08:32:33 +0100
Subject: [PATCH 1/2] Fixed the order of arguments for throttling downloads.
 This fixes part of #2890

---
 Duplicati/Library/Main/BackendManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Duplicati/Library/Main/BackendManager.cs b/Duplicati/Library/Main/BackendManager.cs
index 671769527..a430a0032 100644
--- a/Duplicati/Library/Main/BackendManager.cs
+++ b/Duplicati/Library/Main/BackendManager.cs
@@ -821,7 +821,7 @@ namespace Duplicati.Library.Main
                     {
                         using (var ss = new ShaderStream(nextTierWriter, false))
                         {
-                            using (var ts = new ThrottledStream(ss, m_options.MaxUploadPrSecond, m_options.MaxDownloadPrSecond))
+                            using (var ts = new ThrottledStream(ss, m_options.MaxDownloadPrSecond, m_options.MaxUploadPrSecond))
                             using (var pgs = new Library.Utility.ProgressReportingStream(ts, item.Size, pg => HandleProgress(ts, pg)))
                             {
                                 taskHasher.Start(); // We do not start tasks earlier to be sure the input always gets closed. 
@@ -906,7 +906,7 @@ namespace Duplicati.Library.Main
                     using (var hs = GetFileHasherStream(fs, System.Security.Cryptography.CryptoStreamMode.Write, out getFileHash))
                     using (var ss = new ShaderStream(hs, true))
                     {
-                        using (var ts = new ThrottledStream(ss, m_options.MaxUploadPrSecond, m_options.MaxDownloadPrSecond))
+                        using (var ts = new ThrottledStream(ss, m_options.MaxDownloadPrSecond, m_options.MaxUploadPrSecond))
                         using (var pgs = new Library.Utility.ProgressReportingStream(ts, item.Size, pg => HandleProgress(ts, pg)))
                         { ((Library.Interface.IStreamingBackend)m_backend).Get(item.RemoteFilename, pgs); }
                         ss.Flush();

From 0e7049bd11c3bac7aa0b3dc81ba8550f28ccb1a5 Mon Sep 17 00:00:00 2001
From: Stefan <dbddhkpde@yahoo.com>
Date: Mon, 2 Apr 2018 14:31:32 +0200
Subject: [PATCH 2/2] GUI-icon-update: scheduled jobs now with separate icon
 compared to manual jobs

---
 .../Server/webroot/ngax/img/backupschedule.png   | Bin 0 -> 1039 bytes
 .../Server/webroot/ngax/templates/home.html      |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 Duplicati/Server/webroot/ngax/img/backupschedule.png

diff --git a/Duplicati/Server/webroot/ngax/img/backupschedule.png b/Duplicati/Server/webroot/ngax/img/backupschedule.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6833b73cc2be40ff7d8b49441bd8fe39c45563f
GIT binary patch
literal 1039
zcmeAS@N?(olHy`uVBq!ia0y~yU{C~M4mJh`hVUnc@);NySkfJR9T^xl_H+M9WMyDr
z;4JWnEM{QfI|Ravq8eTe3=9mCC9V-A!TD(=<%vb93<Zgqc_n&zsU->~dIow%h94C&
zr!p`w_jtNEhD5j@y`J0Q8!dDE<3bznGu*B3q}LsiUfMC`c;39cNykO<E!YIT45v6M
zIyqnYI%QJ2@!>g%aUE{G2F58i=M!8sFDmRg@OGcYzWsOa9iL_T|18htovZEUZod9&
z{r~#N&F61LhiOgyb${mEnQ3KaN1L8(zG%^U-J;(!EGBry+(L~jf|ffPr##dPTQJ+y
zzVGHs<(CR?8vb1kE4<JC=4gTT{PS;mCZt&D9n!iI@^nVGSr~8T6~_YkHOGP@JnOG|
z=Nw_!zbyKX{+yPn3zmu|7gY(y^th&4%*gz1;M=`{&Dg7Z#W!o?HGbV0{abg)m!);(
z{qa5FcYnsivzDB@GS_(Oy4wGInRl11yF=iLyw#kzgI-r+-hbd{i~PE1QSRTy4f|!E
zJ>XjN#6Fl&_H*o`Pp^aHKYd`+GP%v)V_+uI{y{X%@j7SE#!no{!3B(~c6-a#HKpHZ
z+h@pGm8AJ6K2$esVfmRo_8a8*AD-i8`~G8YpHt7~NnFXhCT>qyW~$fIdm!)+`|4vC
zH3}s79tT@I*xjpo;#+q_$LpTT9c<e7_g~oU@j?BwdU~?tBR&J&PYi9lKF|5dypj9s
zhG(z+r*+G{+r#D=!;-bSJ3)1_(HW=kKfOWr?vtY<3Ph@YdLG(X7t#KFgV<-oU+>O`
zp0<y_n3#I-?5`s`)xXZ})_&dWx8Lw*&<q#*z0DGj)P;XVCz>Ul@6ia$_0PQe>d4LG
zw{*43((k?eG|_RvEJ1}?HuAEIkLdj>O?z{!TH_x#pT*<33#QKq@!Pa++T9teqH4rc
zx?aaAPMy8y|KInn4}6Z~ZoQ|uebM~g9Ls0CW8d3vvg6{XE-m>B%YPm}Y}94D;{4C$
z?@H1I=bN5e#MOMzATs+!Mc-|^i@sJDb;Z;Je`w6u{O`<FNk_q3pHgzO;$MC}_;6{K
z)-%_Fhw2Fl2A>3Tx4!4QwqUur{@+>h$Chrl{_pfOF<Y>Evi}xo;me*iESalI9agT`
zFL1GUjj^+Rs%@dYMRD_t4H3~c$5LYR^)-GMAAGs{-DmavfrZ?Sj|*7}-SZW??gs?P
z+Q@I4a>r`fp|IpXPZw=Ajla>E*vs{gL-?z}rQmS>oi|)_baz@hM(;KF8FD*T_FC?R
zj+@gg!mg_C=uk6bXI*UUobPG1=&Ssk%8NUsuJ1fO+4SHeAy?Ctf1m4xvoePjPu@Od
z#YS%L@@XM^QWf)m)@i=UyR$}R|LRIz?bp&D1wGB>Hh5fNU|?YIboFyt=akR{0H|H)
AsQ>@~

literal 0
HcmV?d00001

diff --git a/Duplicati/Server/webroot/ngax/templates/home.html b/Duplicati/Server/webroot/ngax/templates/home.html
index da18f9ba3..f822aed94 100644
--- a/Duplicati/Server/webroot/ngax/templates/home.html
+++ b/Duplicati/Server/webroot/ngax/templates/home.html
@@ -3,7 +3,8 @@
         <div class="tasklist">
             <div ng-repeat="item in backups" class="task">
                 <a href ng-click="$parent.TaskMenuID == item.Backup.ID ? $parent.TaskMenuID = null : $parent.TaskMenuID = item.Backup.ID">
-                    <img ng-show="item.Backup.ID != state.activeTask.Item2" src="img/backup.png">
+                    <img ng-show="item.Backup.ID != state.activeTask.Item2 && item.Backup.Metadata.NextScheduledRun == null" src="img/backup.png">
+                    <img ng-show="item.Backup.ID != state.activeTask.Item2 && item.Backup.Metadata.NextScheduledRun != null" src="img/backupschedule.png">
                     <img ng-show="item.Backup.ID == state.activeTask.Item2 && state.programState == 'Running'" src="img/backuprunning.png">
                     <img ng-show="item.Backup.ID == state.activeTask.Item2 && state.programState == 'Paused'" src="img/backuppause.png">
                     {{item.Backup.Name}}