Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Valerio Maggio
2019-08-25 12:37:35 +02:00
158 changed files with 473 additions and 425 deletions

View File

@@ -255,7 +255,9 @@ public abstract class GuiDownloadService implements Runnable {
byte[] buffer = new byte[1024];
for (Entry<String, String> kv : files.entrySet()) {
if (cancel) { break; }
if (cancel) {//stop prevent sleep
GuiBase.getInterface().preventSystemSleep(false);
break; }
count++;
cardSkipped = true; //assume skipped unless saved successfully