diff --git a/pom.xml b/pom.xml
index 1339cffbd..fd0f30075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 4.9
+ 4.10
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.form b/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.form
index 6912f88e0..46fb0000b 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.form
+++ b/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.form
@@ -76,7 +76,7 @@
-
+
diff --git a/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java b/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java
index 95273918d..6107b0568 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/FileMergerDialog.java
@@ -125,7 +125,7 @@ public class FileMergerDialog extends javax.swing.JDialog {
file_button.setFont(new java.awt.Font("Dialog", 0, 18)); // NOI18N
file_button.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/icons8-add-file-30.png"))); // NOI18N
- file_button.setText("Select files");
+ file_button.setText("Select (any) file part");
file_button.setDoubleBuffered(true);
file_button.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -272,7 +272,7 @@ public class FileMergerDialog extends javax.swing.JDialog {
}
- this.file_button.setText("Select file");
+ this.file_button.setText("Select (any) file part");
this.file_button.setEnabled(true);
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 30fc23739..5828b9aae 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -46,7 +46,7 @@ import static java.awt.event.WindowEvent.WINDOW_CLOSING;
*/
public final class MainPanel {
- public static final String VERSION = "4.9";
+ public static final String VERSION = "4.10";
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/MiscTools.java b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
index 51609c438..e5648b5a8 100644
--- a/src/main/java/com/tonikelope/megabasterd/MiscTools.java
+++ b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
@@ -871,7 +871,7 @@ public final class MiscTools {
public static String checkNewVersion(String folder_node, String folder_key) {
- String new_version = null;
+ String new_version_major = null, new_version_minor = null, current_version_major = null, current_version_minor = null;
try {
MegaAPI ma = new MegaAPI();
@@ -884,24 +884,28 @@ public final class MiscTools {
HashMap current_node = (HashMap) o;
- new_version = findFirstRegex("([0-9\\.]+)\\.run", (String) current_node.get("name"), 1);
+ new_version_major = findFirstRegex("([0-9]+)\\.[0-9]+\\.run", (String) current_node.get("name"), 1);
- if (new_version != null && Double.parseDouble(new_version) > Double.parseDouble(VERSION)) {
+ new_version_minor = findFirstRegex("[0-9]+\\.([0-9]+)\\.run", (String) current_node.get("name"), 1);
- break;
+ current_version_major = findFirstRegex("([0-9]+)\\.[0-9]+$", VERSION, 1);
- } else {
+ current_version_minor = findFirstRegex("[0-9]+\\.([0-9]+)$", VERSION, 1);
+
+ if (new_version_major != null && (Integer.parseInt(current_version_major) < Integer.parseInt(new_version_major) || (Integer.parseInt(current_version_major) == Integer.parseInt(new_version_major) && Integer.parseInt(current_version_minor) < Integer.parseInt(new_version_minor)))) {
+
+ return new_version_major + "." + new_version_minor;
- new_version = null;
}
}
+
}
} catch (Exception ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
}
- return new_version;
+ return null;
}
public static void openBrowserURL(final String url) {