diff --git a/src/megabasterd/AboutDialog.form b/src/megabasterd/AboutDialog.form index af289d8ed..c117a0cd5 100644 --- a/src/megabasterd/AboutDialog.form +++ b/src/megabasterd/AboutDialog.form @@ -120,7 +120,7 @@ - + diff --git a/src/megabasterd/AboutDialog.java b/src/megabasterd/AboutDialog.java index dbf3756e7..dac7c7387 100644 --- a/src/megabasterd/AboutDialog.java +++ b/src/megabasterd/AboutDialog.java @@ -69,7 +69,7 @@ public final class AboutDialog extends javax.swing.JDialog { } }); - subtitle_label.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N + subtitle_label.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N subtitle_label.setForeground(new java.awt.Color(102, 102, 102)); subtitle_label.setText("Made with love (and with no warranty) by tonikelope."); subtitle_label.setDoubleBuffered(true); diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java index d8967991d..cddf1b35e 100644 --- a/src/megabasterd/MainPanel.java +++ b/src/megabasterd/MainPanel.java @@ -45,7 +45,7 @@ import org.apache.http.auth.UsernamePasswordCredentials; */ public final class MainPanel { - public static final String VERSION = "2.47"; + public static final String VERSION = "2.48"; public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; public static final int STREAMER_PORT = 1337; diff --git a/src/megabasterd/TransferenceManager.java b/src/megabasterd/TransferenceManager.java index a250d897a..a111fde74 100644 --- a/src/megabasterd/TransferenceManager.java +++ b/src/megabasterd/TransferenceManager.java @@ -382,7 +382,7 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea }); } - if (!isProvisioning_transferences() && !getTransference_provision_queue().isEmpty()) { + if (!isRemoving_transferences() && !isProvisioning_transferences() && !getTransference_provision_queue().isEmpty()) { setProvisioning_transferences(true); @@ -392,11 +392,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea @Override public void run() { - while (isRemoving_transferences()) { - - secureWait(); - } - while (!getTransference_provision_queue().isEmpty()) { Transference transference = getTransference_provision_queue().poll(); @@ -416,18 +411,13 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea } - if (!isStarting_transferences() && !getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) { + if (!isRemoving_transferences() && !isStarting_transferences() && !getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) { setStarting_transferences(true); THREAD_POOL.execute(new Runnable() { @Override public void run() { - while (isRemoving_transferences()) { - - secureWait(); - } - while (!getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) { Transference transference = getTransference_waitstart_queue().poll();