From 1c27d781ecfe898f0786c63082da13eb20a4c7d1 Mon Sep 17 00:00:00 2001 From: tonikelope Date: Sun, 30 Oct 2016 21:00:19 +0100 Subject: [PATCH] 1.49 --- src/megabasterd/Download.java | 10 ++++++---- src/megabasterd/DownloadView.java | 1 - src/megabasterd/MainPanel.java | 2 +- src/megabasterd/Upload.java | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/megabasterd/Download.java b/src/megabasterd/Download.java index 3b8913842..5d8d2bdc7 100644 --- a/src/megabasterd/Download.java +++ b/src/megabasterd/Download.java @@ -309,6 +309,8 @@ public final class Download implements Transference, Runnable, SecureNotifiable @Override public void pause() { + System.out.println("Pause hello"); + if (isPause()) { setPause(false); @@ -332,6 +334,8 @@ public final class Download implements Transference, Runnable, SecureNotifiable } _main_panel.getDownload_manager().secureNotify(); + + System.out.println("Pause bye"); } @Override @@ -1073,12 +1077,10 @@ public final class Download implements Transference, Runnable, SecureNotifiable } - public synchronized void stopDownloader() { + public void stopDownloader() { if (!_exit) { - System.out.println("Stopping downloader..."); - _exit = true; try { @@ -1122,7 +1124,7 @@ public final class Download implements Transference, Runnable, SecureNotifiable } } - public synchronized void emergencyStopDownloader(String reason) { + public void emergencyStopDownloader(String reason) { if (!_exit && _fatal_error == null) { _fatal_error = reason != null ? reason : "FATAL ERROR!"; diff --git a/src/megabasterd/DownloadView.java b/src/megabasterd/DownloadView.java index 3b9af7388..95c4411dc 100644 --- a/src/megabasterd/DownloadView.java +++ b/src/megabasterd/DownloadView.java @@ -360,7 +360,6 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen private void pause_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pause_buttonActionPerformed _download.pause(); - }//GEN-LAST:event_pause_buttonActionPerformed @Override diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java index 4e2f2d1c3..66c4f30b9 100644 --- a/src/megabasterd/MainPanel.java +++ b/src/megabasterd/MainPanel.java @@ -59,7 +59,7 @@ import static megabasterd.Transference.MAX_TRANSFERENCE_SPEED_DEFAULT; */ public final class MainPanel { - public static final String VERSION = "1.48"; + public static final String VERSION = "1.49"; public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int STREAMER_PORT = 1337; public static final int WATCHDOG_PORT = 1338; diff --git a/src/megabasterd/Upload.java b/src/megabasterd/Upload.java index 1e1c0ae3a..b02046582 100644 --- a/src/megabasterd/Upload.java +++ b/src/megabasterd/Upload.java @@ -935,7 +935,7 @@ public final class Upload implements Transference, Runnable, SecureNotifiable { } } - public synchronized void emergencyStopUploader(String reason) { + public void emergencyStopUploader(String reason) { if (!_exit && _fatal_error == null) { _fatal_error = reason != null ? reason : "FATAL ERROR!"; @@ -957,7 +957,8 @@ public final class Upload implements Transference, Runnable, SecureNotifiable { _exit = exit; } - public synchronized void stopUploader() { + public void stopUploader() { + if (!_exit) { _exit = true;