Merge branch 'master' into master

2018-07-04 14:25:10 -05:00
parent ff6f4ea339 702a07b5d3
commit a29282e3d9
49 changed files with 5081 additions and 1926 deletions
@@ -117,6 +117,9 @@
        <setting id="tmdb_cache_expire" type="enum" lvalues="70158|70159|70160|70161|70170" label="$ADDON[plugin.video.alfa 70162]" enable="eq(-1,true)" default="4"/>
        <setting id="tmdb_clean_db_cache" type="action" label="$ADDON[plugin.video.alfa 70163]" action="RunPlugin(plugin://plugin.video.alfa/?ew0KICAgICJhY3Rpb24iOiAic2NyaXB0Ig0KfQ==)" />

-   </category>
+        <setting type="sep"/>
+        <setting label="Para evitar esperar demasiado cuando un servidor no responde:" type="lsep"/>
+        <setting id="httptools_timeout" type="labelenum" values="0|5|10|15|20|25|30" label="Timeout (tiempo de espera máximo)" default="15"/>
+    </category>

 </settings>