X-Git-Url: https://git.pterodactylus.net/?p=xudocci.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=00d1fbdf4a949ffd78da8d3873ce6351601f3890;hp=b020c1a74edc045d2db8cf46dbb220fb625be016;hb=44825f1cf5ddb021cbf9b8416e8649e768905e77;hpb=2769f52b856c2ebb1ec06836ca81591b7e99a4ba

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index b020c1a..00d1fbd 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -428,17 +428,17 @@ public class Core extends AbstractExecutionThreadService {
 			}
 
 			Map<Long, Network> timesForNextConnects = new TreeMap<>(missingNetworks.stream()
-					.collect(Collectors.toMap(connectionBackoff::getBackoff, Function.identity(), (network, ignore) -> network)));
+					.collect(Collectors.toMap(connectionBackoff::getConnectionTime, Function.identity(), (network, ignore) -> network)));
 
 			Optional<Entry<Long, Network>> firstNetwork = Optional.fromNullable(timesForNextConnects.entrySet().stream().findFirst().orElse(null));
 			if (!firstNetwork.isPresent()) {
 				continue;
 			}
-			if (firstNetwork.get().getKey() > 0) {
-				eventBus.post(new GenericMessage(String.format("Waiting %d minutes to connect to %s...", TimeUnit.MILLISECONDS.toMinutes(firstNetwork.get().getKey()), firstNetwork.get().getValue().name())));
+			if (firstNetwork.get().getKey() > System.currentTimeMillis()) {
+				eventBus.post(new GenericMessage(String.format("Waiting %d minutes to connect to %s...", TimeUnit.MILLISECONDS.toMinutes(firstNetwork.get().getKey() - System.currentTimeMillis()), firstNetwork.get().getValue().name())));
 				synchronized (syncObject) {
 					try {
-						syncObject.wait(firstNetwork.get().getKey());
+						syncObject.wait(firstNetwork.get().getKey() - System.currentTimeMillis());
 					} catch (InterruptedException ie1) {
 						/* ignore. */
 					}
@@ -446,6 +446,9 @@ public class Core extends AbstractExecutionThreadService {
 				if (!isRunning()) {
 					break;
 				}
+				if (firstNetwork.get().getKey() > System.currentTimeMillis()) {
+					continue;
+				}
 			}
 
 			connectNetwork(firstNetwork.get().getValue());