diff --git a/megabasterd (Copia en conflicto de lacueva 2017-12-06).db b/megabasterd (Copia en conflicto de lacueva 2017-12-06).db
new file mode 100644
index 000000000..16e9296e4
Binary files /dev/null and b/megabasterd (Copia en conflicto de lacueva 2017-12-06).db differ
diff --git a/src/megabasterd/Download.java b/src/megabasterd/Download.java
index 5217a1c3a..460c0782c 100644
--- a/src/megabasterd/Download.java
+++ b/src/megabasterd/Download.java
@@ -48,7 +48,6 @@ public final class Download implements Transference, Runnable, SecureSingleThrea
public static final int WORKERS_DEFAULT = 6;
public static final boolean USE_MEGA_ACCOUNT_DOWN = false;
public static final int CHUNK_SIZE_MULTI = 10;
- public static final int WATCHDOG_SMART_PROXY_TIMEOUT = 3600;
private final MainPanel _main_panel;
private volatile DownloadView _view;
diff --git a/src/megabasterd/FolderLinkDialog.form b/src/megabasterd/FolderLinkDialog.form
index 0ee17f465..9be4d42b3 100644
--- a/src/megabasterd/FolderLinkDialog.form
+++ b/src/megabasterd/FolderLinkDialog.form
@@ -66,7 +66,7 @@
-
+
@@ -186,6 +186,9 @@
+
+
+
diff --git a/src/megabasterd/FolderLinkDialog.java b/src/megabasterd/FolderLinkDialog.java
index bdab93c5a..93973729f 100644
--- a/src/megabasterd/FolderLinkDialog.java
+++ b/src/megabasterd/FolderLinkDialog.java
@@ -147,6 +147,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
}
});
+ restore_button.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
restore_button.setText("Restore folder data");
restore_button.setDoubleBuffered(true);
restore_button.addActionListener(new java.awt.event.ActionListener() {
@@ -197,7 +198,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
.addComponent(folder_link_label)
.addComponent(restore_button))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE)
+ .addComponent(file_tree_scrollpane, javax.swing.GroupLayout.DEFAULT_SIZE, 381, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(total_space_label)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
diff --git a/src/megabasterd/GlobalSpeedMeter.java b/src/megabasterd/GlobalSpeedMeter.java
index db1337e6d..efbebcb64 100644
--- a/src/megabasterd/GlobalSpeedMeter.java
+++ b/src/megabasterd/GlobalSpeedMeter.java
@@ -77,15 +77,15 @@ public final class GlobalSpeedMeter implements Runnable {
double current_speed = (progress - last_progress) / sleep_time;
- last_progress = progress;
-
- sp = Math.round(current_speed);
+ sp = last_progress > 0 ? Math.round(current_speed) : 0;
if (sp > 0) {
transference.getView().updateSpeed(formatBytes(sp) + "/s", true);
}
+ last_progress = progress;
+
no_data_count = 0;
} else {
diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java
index c21518b1d..9aeea8200 100644
--- a/src/megabasterd/MainPanel.java
+++ b/src/megabasterd/MainPanel.java
@@ -45,7 +45,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
*/
public final class MainPanel {
- public static final String VERSION = "2.49";
+ public static final String VERSION = "2.50";
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/ProgressMeter.java b/src/megabasterd/ProgressMeter.java
index 4aef640c9..9555cc32b 100644
--- a/src/megabasterd/ProgressMeter.java
+++ b/src/megabasterd/ProgressMeter.java
@@ -16,7 +16,7 @@ public final class ProgressMeter implements Runnable, SecureSingleThreadNotifiab
_notified = false;
_secure_notify_lock = new Object();
_transference = transference;
- _progress = transference.getProgress();
+ _progress = 0;
_exit = false;
}
@@ -56,6 +56,8 @@ public final class ProgressMeter implements Runnable, SecureSingleThreadNotifiab
public void run() {
Logger.getLogger(getClass().getName()).log(Level.INFO, "{0} ProgressMeter hello!", Thread.currentThread().getName());
+ _progress = _transference.getProgress();
+
while (!_exit || !_transference.getPartialProgress().isEmpty()) {
Integer reads;
diff --git a/src/megabasterd/SettingsDialog.form b/src/megabasterd/SettingsDialog.form
index 7a54e11e0..04cbbe774 100644
--- a/src/megabasterd/SettingsDialog.form
+++ b/src/megabasterd/SettingsDialog.form
@@ -574,7 +574,7 @@
-
+
@@ -701,7 +701,7 @@
-
+
diff --git a/src/megabasterd/SettingsDialog.java b/src/megabasterd/SettingsDialog.java
index afea1dae5..81e5e7b60 100644
--- a/src/megabasterd/SettingsDialog.java
+++ b/src/megabasterd/SettingsDialog.java
@@ -897,7 +897,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
});
rec_upload_slots_label.setFont(new java.awt.Font("Dialog", 2, 14)); // NOI18N
- rec_upload_slots_label.setText("Note: MULTI-SLOT it's more robust against upload errors but it might be slower.");
+ rec_upload_slots_label.setText("Note: MULTI-SLOT seems to be more robust against upload errors but it might be slower.");
javax.swing.GroupLayout uploads_panelLayout = new javax.swing.GroupLayout(uploads_panel);
uploads_panel.setLayout(uploads_panelLayout);
@@ -930,7 +930,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGap(3, 3, 3)
.addComponent(max_up_speed_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(limit_upload_speed_checkbox))
- .addGap(0, 321, Short.MAX_VALUE)))
+ .addGap(0, 255, Short.MAX_VALUE)))
.addContainerGap())))
);
uploads_panelLayout.setVerticalGroup(