From 466a5c015fd873076f2cb56fc9420ee81151be31 Mon Sep 17 00:00:00 2001
From: tonikelope <tonikelope@lacueva.localdomain>
Date: Thu, 25 Jan 2018 23:11:32 +0100
Subject: [PATCH] 2.90

---
 src/megabasterd/ChunkDownloader.java |  5 ++++-
 src/megabasterd/ChunkUploader.java   |  5 ++++-
 src/megabasterd/DownloadView.form    |  2 +-
 src/megabasterd/DownloadView.java    |  2 +-
 src/megabasterd/MainPanel.java       |  2 +-
 src/megabasterd/MainPanelView.form   | 10 ++++++++++
 src/megabasterd/MainPanelView.java   |  4 ++++
 src/megabasterd/UploadView.form      |  2 +-
 src/megabasterd/UploadView.java      |  2 +-
 9 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/megabasterd/ChunkDownloader.java b/src/megabasterd/ChunkDownloader.java
index d613aa9ce..b914fc1ad 100644
--- a/src/megabasterd/ChunkDownloader.java
+++ b/src/megabasterd/ChunkDownloader.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.logging.Level;
@@ -273,7 +274,9 @@ public void run() {
                         _download.getProgress_meter().secureNotify();
                     }
 
-                    conta_error++;
+                    if (!(ex instanceof SocketTimeoutException)) {
+                        conta_error++;
+                    }
 
                     if (!_exit) {
 
diff --git a/src/megabasterd/ChunkUploader.java b/src/megabasterd/ChunkUploader.java
index 5a3660eee..98d197767 100644
--- a/src/megabasterd/ChunkUploader.java
+++ b/src/megabasterd/ChunkUploader.java
@@ -7,6 +7,7 @@
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.RandomAccessFile;
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.InvalidAlgorithmParameterException;
@@ -364,7 +365,9 @@ public CloseableHttpResponse call() throws IOException {
                         _upload.getProgress_meter().secureNotify();
                     }
 
-                    conta_error++;
+                    if (!(ex instanceof SocketTimeoutException)) {
+                        conta_error++;
+                    }
 
                     if (!_exit) {
 
diff --git a/src/megabasterd/DownloadView.form b/src/megabasterd/DownloadView.form
index d67668931..4356b5827 100644
--- a/src/megabasterd/DownloadView.form
+++ b/src/megabasterd/DownloadView.form
@@ -4,7 +4,7 @@
   <Properties>
     <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
       <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
-        <LineBorder roundedCorners="true" thickness="4">
+        <LineBorder roundedCorners="true" thickness="3">
           <Color PropertyName="color" blue="ff" green="cc" red="99" type="rgb"/>
         </LineBorder>
       </Border>
diff --git a/src/megabasterd/DownloadView.java b/src/megabasterd/DownloadView.java
index 969d76041..9c0e04060 100644
--- a/src/megabasterd/DownloadView.java
+++ b/src/megabasterd/DownloadView.java
@@ -151,7 +151,7 @@ private void initComponents() {
         slot_status_label = new javax.swing.JLabel();
         open_folder_button = new javax.swing.JButton();
 
-        setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 4, true));
+        setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 3, true));
 
         status_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
         status_label.setText("status");
diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java
index 72fff1466..e20359e88 100644
--- a/src/megabasterd/MainPanel.java
+++ b/src/megabasterd/MainPanel.java
@@ -48,7 +48,7 @@
  */
 public final class MainPanel {
 
-    public static final String VERSION = "2.89";
+    public static final String VERSION = "2.90";
     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/megabasterd/MainPanelView.form b/src/megabasterd/MainPanelView.form
index e6f88481b..cd3c8ebf0 100644
--- a/src/megabasterd/MainPanelView.form
+++ b/src/megabasterd/MainPanelView.form
@@ -368,6 +368,11 @@
               </Events>
             </Component>
             <Container class="javax.swing.JScrollPane" name="jScrollPane_down">
+              <Properties>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="null"/>
+                </Property>
+              </Properties>
 
               <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
               <SubComponents>
@@ -493,6 +498,11 @@
               </Events>
             </Component>
             <Container class="javax.swing.JScrollPane" name="jScrollPane_up">
+              <Properties>
+                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+                  <Border info="null"/>
+                </Property>
+              </Properties>
 
               <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
               <SubComponents>
diff --git a/src/megabasterd/MainPanelView.java b/src/megabasterd/MainPanelView.java
index 620814567..be8ce7a4e 100644
--- a/src/megabasterd/MainPanelView.java
+++ b/src/megabasterd/MainPanelView.java
@@ -273,6 +273,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
+        jScrollPane_down.setBorder(null);
+
         jPanel_scroll_down.setLayout(new javax.swing.BoxLayout(jPanel_scroll_down, javax.swing.BoxLayout.Y_AXIS));
         jScrollPane_down.setViewportView(jPanel_scroll_down);
 
@@ -341,6 +343,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
+        jScrollPane_up.setBorder(null);
+
         jPanel_scroll_up.setLayout(new javax.swing.BoxLayout(jPanel_scroll_up, javax.swing.BoxLayout.Y_AXIS));
         jScrollPane_up.setViewportView(jPanel_scroll_up);
 
diff --git a/src/megabasterd/UploadView.form b/src/megabasterd/UploadView.form
index 6b6fb162a..3e49eea31 100644
--- a/src/megabasterd/UploadView.form
+++ b/src/megabasterd/UploadView.form
@@ -4,7 +4,7 @@
   <Properties>
     <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
       <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
-        <LineBorder roundedCorners="true" thickness="4">
+        <LineBorder roundedCorners="true" thickness="3">
           <Color PropertyName="color" blue="ff" green="cc" red="99" type="rgb"/>
         </LineBorder>
       </Border>
diff --git a/src/megabasterd/UploadView.java b/src/megabasterd/UploadView.java
index 2127872e0..24229fb14 100644
--- a/src/megabasterd/UploadView.java
+++ b/src/megabasterd/UploadView.java
@@ -124,7 +124,7 @@ private void initComponents() {
         folder_link_button = new javax.swing.JButton();
         file_link_button = new javax.swing.JButton();
 
-        setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 4, true));
+        setBorder(new javax.swing.border.LineBorder(new java.awt.Color(153, 204, 255), 3, true));
 
         status_label.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
         status_label.setText("status");