[Pkg-owncloud-commits] [owncloud-client] 472/498: Propagator: Re-order statement of previous commit

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 593aa003d66945f8596cb802d8b0fc4ecf68d76b
Author: Markus Goetz <markus at woboq.com>
Date:   Thu Aug 6 15:28:09 2015 +0200

    Propagator: Re-order statement of previous commit
    
    The user should be allowed to override.
    For issue #3382
    Will also help for #3095
---
 src/libsync/owncloudpropagator.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 2eaed4f..8640bbb 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -51,15 +51,16 @@ OwncloudPropagator::~OwncloudPropagator()
 /* The maximum number of active job in parallel  */
 int OwncloudPropagator::maximumActiveJob()
 {
+    static int max = qgetenv("OWNCLOUD_MAX_PARALLEL").toUInt();
+    if (!max) {
+        max = 3; //default
+    }
+
     if (_downloadLimit != 0 || _uploadLimit != 0) {
         // disable parallelism when there is a network limit.
         return 1;
     }
 
-    static int max = qgetenv("OWNCLOUD_MAX_PARALLEL").toUInt();
-    if (!max) {
-        max = 3; //default
-    }
     return max;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git