5.70

-Pro acount download fix -Progress bar color changed
tonikelope · Nov 9, 2018 · 6455c35 · 6455c35
1 parent 73778d2
commit 6455c35
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>5.69</version>
+    <version>5.70</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

diff --git a/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java b/src/main/java/com/tonikelope/megabasterd/ChunkUploader.java
@@ -22,7 +22,7 @@
  */
 public class ChunkUploader implements Runnable, SecureSingleThreadNotifiable {
 
-    public static final int MAX_CHUNK_ERROR = 10;
+    public static final int MAX_CHUNK_ERROR = 20;
     private final int _id;
     private final Upload _upload;
     private volatile boolean _exit;

diff --git a/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/LinkGrabberDialog.java
@@ -424,10 +424,20 @@ private void use_mega_account_down_comboboxItemStateChanged(java.awt.event.ItemE
                     @Override
                     public void run() {
 
+                        boolean use_account = true;
+
                         try {
-                            checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item);
+
+                            if (checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item) == null) {
+                                use_account = false;
+                            }
+
                         } catch (Exception ex) {
 
+                            use_account = false;
+                        }
+
+                        if (!use_account) {
                             swingInvoke(new Runnable() {
                                 @Override
                                 public void run() {

diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -39,6 +39,7 @@
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 import static javax.swing.JOptionPane.YES_NO_CANCEL_OPTION;
 import static javax.swing.JOptionPane.showOptionDialog;
+import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 
 /**
@@ -47,7 +48,7 @@
  */
 public final class MainPanel {
 
-    public static final String VERSION = "5.69";
+    public static final String VERSION = "5.70";
     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;
@@ -75,6 +76,9 @@ public static void main(String args[]) {
 
         setNimbusLookAndFeel();
 
+        UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+        defaults.put("nimbusOrange", defaults.get("nimbusFocus"));
+
         if (args.length > 0) {
 
             try {

diff --git a/src/main/java/com/tonikelope/megabasterd/StreamerDialog.java b/src/main/java/com/tonikelope/megabasterd/StreamerDialog.java
@@ -294,15 +294,24 @@ private void use_mega_account_down_comboboxItemStateChanged(java.awt.event.ItemE
                     @Override
                     public void run() {
 
+                        boolean use_account = true;
+
                         try {
-                            checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item);
+
+                            if (checkMegaAccountLoginAndShowMasterPassDialog(_main_panel, tthis, _selected_item) == null) {
+                                use_account = false;
+                            }
+
                         } catch (Exception ex) {
 
+                            use_account = false;
+                        }
+
+                        if (!use_account) {
                             swingInvoke(new Runnable() {
                                 @Override
                                 public void run() {
                                     use_mega_account_down_combobox.setSelectedIndex(_main_panel.getMega_accounts().size());
-                                    pack();
 
                                 }
                             });

diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png