Merge branch 'pr/n959_philou75' into stable

Conflicts:
	module/plugins/internal/SimpleHoster.py

1 files changed, 3 insertions, 3 deletions

diff --git a/module/plugins/internal/SimpleHoster.py b/module/plugins/internal/SimpleHoster.py
index ddaea020a..992454451 100644
--- a/module/plugins/internal/SimpleHoster.py
+++ b/module/plugins/internal/SimpleHoster.py
@@ -144,7 +144,7 @@ def _isDirectLink(self, url, resumable=True):
 class SimpleHoster(Hoster):
     __name__    = "SimpleHoster"
     __type__    = "hoster"
-    __version__ = "0.72"
+    __version__ = "0.73"
 
     __pattern__ = r'^unmatchable$'
 
@@ -416,8 +416,8 @@ class SimpleHoster(Hoster):
             m = re.search(self.WAIT_PATTERN, self.html)
             if m:
                 wait_time = sum([int(v) * {"hr": 3600, "hour": 3600, "min": 60, "sec": 1}[u.lower()] for v, u in
-                                 re.findall(r'(\d+)\s*(hr|hour|min|sec)', m, re.I)])
-                self.wait(wait_time, False)
+                                 re.findall(r'(\d+)\s*(hr|hour|min|sec)', m.group(0), re.I)])
+                self.wait(wait_time, True if wait_time > 300 else False)
                 return
 
         self.info.pop('error', None)