X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fui%2Fstdin%2FCommandReader.java;h=836f4061b8d4c237bc39e1bea10738eaa62bd9f9;hb=287af7be5a3fe79882649783649889f079451d27;hp=a530a1d28935d9e2a397b3259a8c1d452a11b210;hpb=99a4d802fbf7593c62c5cc36620e68cfc0b8c4b6;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
index a530a1d..836f406 100644
--- a/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
+++ b/src/main/java/net/pterodactylus/xdcc/ui/stdin/CommandReader.java
@@ -118,8 +118,14 @@ public class CommandReader extends AbstractExecutionThreadService {
 				writeLine("End of Search.");
 			} else if (words[0].equalsIgnoreCase("dcc")) {
 				int counter = 0;
-				for (DccReceiver dccReceiver : core.dccReceivers()) {
-					writer.write(String.format("[%d] %s (%s, ", counter++, dccReceiver.filename(), f(dccReceiver.size())));
+				for (Download download : core.downloads()) {
+					DccReceiver dccReceiver = download.dccReceiver();
+					if (dccReceiver == null) {
+						/* download has not even started. */
+						writer.write(String.format("[%d] %s requested from %s (not started yet)\n", counter++, download.pack().name(), download.bot().name()));
+						continue;
+					}
+					writer.write(String.format("[%d] %s from %s (%s, ", counter++, dccReceiver.filename(), download.bot().name(), f(dccReceiver.size())));
 					if (dccReceiver.isRunning()) {
 						writer.write(String.format("%.1f%%, %s", dccReceiver.progress() * 100.0 / dccReceiver.size(), f(dccReceiver.currentRate())));
 					} else {