This commit is contained in:
tonikelope 2017-12-04 10:34:20 +01:00
parent 6292777c25
commit ae8c8db98b
4 changed files with 5 additions and 15 deletions

View File

@ -120,7 +120,7 @@
<Component class="javax.swing.JLabel" name="subtitle_label"> <Component class="javax.swing.JLabel" name="subtitle_label">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="18" style="1"/> <Font name="Dialog" size="14" style="1"/>
</Property> </Property>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor"> <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="66" green="66" red="66" type="rgb"/> <Color blue="66" green="66" red="66" type="rgb"/>

View File

@ -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.setForeground(new java.awt.Color(102, 102, 102));
subtitle_label.setText("Made with love (and with no warranty) by tonikelope."); subtitle_label.setText("Made with love (and with no warranty) by tonikelope.");
subtitle_label.setDoubleBuffered(true); subtitle_label.setDoubleBuffered(true);

View File

@ -45,7 +45,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
*/ */
public final class MainPanel { 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 THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
public static final int STREAMER_PORT = 1337; public static final int STREAMER_PORT = 1337;

View File

@ -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); setProvisioning_transferences(true);
@ -392,11 +392,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
@Override @Override
public void run() { public void run() {
while (isRemoving_transferences()) {
secureWait();
}
while (!getTransference_provision_queue().isEmpty()) { while (!getTransference_provision_queue().isEmpty()) {
Transference transference = getTransference_provision_queue().poll(); 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); setStarting_transferences(true);
THREAD_POOL.execute(new Runnable() { THREAD_POOL.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
while (isRemoving_transferences()) {
secureWait();
}
while (!getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) { while (!getTransference_waitstart_queue().isEmpty() && getTransference_running_list().size() < _max_running_trans) {
Transference transference = getTransference_waitstart_queue().poll(); Transference transference = getTransference_waitstart_queue().poll();