6.77

-6.76 fix

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tonikelope</groupId>
     <artifactId>MegaBasterd</artifactId>
-    <version>6.76</version>
+    <version>6.77</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

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.76";
+    public static final String VERSION = "6.77";
     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;

src/main/java/com/tonikelope/megabasterd/SettingsDialog.java

@@ -580,7 +580,9 @@ public class SettingsDialog extends javax.swing.JDialog {
 
         String custom_proxy_list = DBTools.selectSettingValue("custom_proxy_list");
 
-        custom_proxy_textarea.setText(custom_proxy_list);
+        if (custom_proxy_list != null) {
+            custom_proxy_textarea.setText(custom_proxy_list);
+        }
 
         _remember_master_pass = true;
 

src/main/java/com/tonikelope/megabasterd/SmartMegaProxyManager.java

@@ -81,27 +81,31 @@ public final class SmartMegaProxyManager {
 
             String custom_proxy_list = DBTools.selectSettingValue("custom_proxy_list");
 
-            ArrayList<String> custom_list = new ArrayList<>(Arrays.asList(custom_proxy_list.split("\\r?\\n")));
+            LinkedHashMap<String, Long> custom_clean_list = new LinkedHashMap<>();;
 
-            LinkedHashMap<String, Long> custom_clean_list = new LinkedHashMap<>();
+            if (custom_proxy_list != null) {
 
-            if (!custom_list.isEmpty()) {
+                ArrayList<String> custom_list = new ArrayList<>(Arrays.asList(custom_proxy_list.split("\\r?\\n")));
 
-                Long current_time = System.currentTimeMillis();
+                if (!custom_list.isEmpty()) {
 
-                for (String proxy : custom_list) {
+                    Long current_time = System.currentTimeMillis();
 
-                    if (proxy.trim().matches(".+?:[0-9]{1,5}")) {
-                        custom_clean_list.put(proxy, current_time);
+                    for (String proxy : custom_list) {
+
+                        if (proxy.trim().matches(".+?:[0-9]{1,5}")) {
+                            custom_clean_list.put(proxy, current_time);
+                        }
                     }
                 }
-            }
 
-            if (!custom_clean_list.isEmpty()) {
+                if (!custom_clean_list.isEmpty()) {
 
-                _proxy_list.clear();
+                    _proxy_list.clear();
+
+                    _proxy_list.putAll(custom_clean_list);
+                }
 
-                _proxy_list.putAll(custom_clean_list);
             }
 
             if (custom_clean_list.isEmpty() && _proxy_list_url != null && _proxy_list_url.length() > 0) {