diff --git a/pom.xml b/pom.xml
index 3234bfe50..03e8c191d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 6.71
+ 6.72
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/DownloadManager.java b/src/main/java/com/tonikelope/megabasterd/DownloadManager.java
index 3294c00fc..7e24bfe90 100644
--- a/src/main/java/com/tonikelope/megabasterd/DownloadManager.java
+++ b/src/main/java/com/tonikelope/megabasterd/DownloadManager.java
@@ -3,7 +3,6 @@ package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.DBTools.*;
import static com.tonikelope.megabasterd.MainPanel.*;
import static com.tonikelope.megabasterd.MiscTools.*;
-import java.awt.Component;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -118,19 +117,6 @@ public class DownloadManager extends TransferenceManager {
getTransference_waitstart_queue().addAll(aux);
- getTransference_waitstart_queue().forEach((t1) -> {
- swingInvoke(() -> {
- getScroll_panel().remove((Component) t1.getView());
- getScroll_panel().add((Component) t1.getView());
- });
- });
- getTransference_finished_queue().forEach((t2) -> {
- swingInvoke(() -> {
- getScroll_panel().remove((Component) t2.getView());
- getScroll_panel().add((Component) t2.getView());
- });
- });
-
}
} else {
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 1d745b731..aeb472166 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -53,7 +53,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
- public static final String VERSION = "6.71";
+ public static final String VERSION = "6.72";
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/main/java/com/tonikelope/megabasterd/MainPanelView.java b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
index 7f7558e4e..25bb3c8ec 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanelView.java
@@ -413,7 +413,6 @@ public final class MainPanelView extends javax.swing.JFrame {
jTabbedPane1.setTitleAt(1, LabelTranslatorSingleton.getInstance().translate("Uploads"));
jTabbedPane1.setDropTarget(new DropTarget() {
- //Thanks to -> https://stackoverflow.com/users/6286694/abika
public boolean canImport(DataFlavor[] flavors) {
for (DataFlavor flavor : flavors) {
if (flavor.isFlavorJavaFileListType()) {
diff --git a/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
index 0d139fdb6..1dec1fbc3 100644
--- a/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
+++ b/src/main/java/com/tonikelope/megabasterd/TransferenceManager.java
@@ -570,23 +570,25 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
}
}
+
synchronized (getQueue_sort_lock()) {
- if (!isPreprocessing_transferences() && !isProvisioning_transferences()) {
- sortTransferenceWaitStartQueue();
- getTransference_waitstart_queue().forEach((up) -> {
- swingInvoke(() -> {
- getScroll_panel().remove((Component) up.getView());
- getScroll_panel().add((Component) up.getView());
- });
+
+ sortTransferenceWaitStartQueue();
+ getTransference_waitstart_queue().forEach((up) -> {
+ swingInvoke(() -> {
+ getScroll_panel().remove((Component) up.getView());
+ getScroll_panel().add((Component) up.getView());
});
- getTransference_finished_queue().forEach((up) -> {
- swingInvoke(() -> {
- getScroll_panel().remove((Component) up.getView());
- getScroll_panel().add((Component) up.getView());
- });
+ });
+ getTransference_finished_queue().forEach((up) -> {
+ swingInvoke(() -> {
+ getScroll_panel().remove((Component) up.getView());
+ getScroll_panel().add((Component) up.getView());
});
- }
+ });
+
}
+
_frozen = false;
setProvisioning_transferences(false);
secureNotify();
diff --git a/src/main/java/com/tonikelope/megabasterd/UploadManager.java b/src/main/java/com/tonikelope/megabasterd/UploadManager.java
index 4c7930d7a..ffd23638e 100644
--- a/src/main/java/com/tonikelope/megabasterd/UploadManager.java
+++ b/src/main/java/com/tonikelope/megabasterd/UploadManager.java
@@ -1,7 +1,6 @@
package com.tonikelope.megabasterd;
import static com.tonikelope.megabasterd.MiscTools.*;
-import java.awt.Component;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -54,19 +53,6 @@ public class UploadManager extends TransferenceManager {
getTransference_waitstart_queue().addAll(aux);
- getTransference_waitstart_queue().forEach((t1) -> {
- swingInvoke(() -> {
- getScroll_panel().remove((Component) t1.getView());
- getScroll_panel().add((Component) t1.getView());
- });
- });
- getTransference_finished_queue().forEach((t2) -> {
- swingInvoke(() -> {
- getScroll_panel().remove((Component) t2.getView());
- getScroll_panel().add((Component) t2.getView());
- });
- });
-
}
} else {
getTransference_waitstart_queue().add(upload);
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index e96b1cd38..634367199 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ