From 613dd77d2c86dd73725df4fa8b8eff6af8030852 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Mon, 15 Oct 2012 21:30:46 +0000 Subject: [PATCH] only display tracker error if no peers --- .../org/klomp/snark/web/I2PSnarkServlet.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index d926ee2d43..d08210a4f9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -999,14 +999,16 @@ public class I2PSnarkServlet extends DefaultServlet { } else if (snark.isAllocating()) { statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Allocating") + "\"></td>" + "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Allocating"); - } else if (err != null) { - if (isRunning && curPeers > 0 && !showPeers) - statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\"></td>" + - "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") + - ": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" + - curPeers + thinsp(noThinsp) + - ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; - else if (isRunning) + } else if (err != null && curPeers == 0) { + // let's only show this if we have no peers, otherwise PEX and DHT should bail us out, user doesn't care + //if (isRunning && curPeers > 0 && !showPeers) + // statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\"></td>" + + // "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") + + // ": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" + + // curPeers + thinsp(noThinsp) + + // ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; + //else if (isRunning) + if (isRunning) statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\"></td>" + "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") + ": " + curPeers + thinsp(noThinsp) + -- GitLab