From 3658ff03dd648b36acf84029e661803bc4adf65d Mon Sep 17 00:00:00 2001
From: tonikelope <tonikelope@gmail.com>
Date: Mon, 3 Oct 2016 01:35:58 +0200
Subject: [PATCH] 1.10

---
 src/megabasterd/ChunkWriter.java           | 4 ++--
 src/megabasterd/Download.java              | 9 ++-------
 src/megabasterd/KissVideoStreamServer.java | 2 +-
 src/megabasterd/Upload.java                | 6 +-----
 src/megabasterd/UploadMACGenerator.java    | 4 ++--
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/megabasterd/ChunkWriter.java b/src/megabasterd/ChunkWriter.java
index 3ad6ef35e..922c867c8 100644
--- a/src/megabasterd/ChunkWriter.java
+++ b/src/megabasterd/ChunkWriter.java
@@ -137,7 +137,7 @@ public final class ChunkWriter implements Runnable, SecureNotifiable {
                 
                 if(_file_size > 0)
                 {
-                    while(!_exit && (!_download.isStopped() || _download.chunkDownloadersRunning()) && _bytes_written < _file_size)
+                    while(!_exit && (!_download.isStopped() || !_download.getChunkworkers().isEmpty()) && _bytes_written < _file_size)
                     {
                         while(_chunk_queue.containsKey(_last_chunk_id_written+1))
                         {
@@ -160,7 +160,7 @@ public final class ChunkWriter implements Runnable, SecureNotifiable {
 
                         }
 
-                        if(!_exit && (!_download.isStopped() || _download.chunkDownloadersRunning()) && _bytes_written < _file_size)
+                        if(!_exit && (!_download.isStopped() || !_download.getChunkworkers().isEmpty()) && _bytes_written < _file_size)
                         {
                             
                             System.out.println("Filewriter waiting for chunk ["+(_last_chunk_id_written+1)+"]...");
diff --git a/src/megabasterd/Download.java b/src/megabasterd/Download.java
index 691118a3a..4295292c0 100644
--- a/src/megabasterd/Download.java
+++ b/src/megabasterd/Download.java
@@ -853,7 +853,7 @@ public final class Download implements Transference, Runnable, SecureNotifiable
     }
     
 
-    /* OJO!! -> ESTO ESTÁ CAMBIADO Y NO COMPROBADO!! */
+    
     public synchronized String getDownloadUrlForWorker() throws IOException
     {
         if(_last_download_url != null && checkMegaDownloadUrl(_last_download_url)) {
@@ -951,12 +951,7 @@ public final class Download implements Transference, Runnable, SecureNotifiable
         }
     }
    
-    public synchronized boolean chunkDownloadersRunning()
-    {
-        return !getChunkworkers().isEmpty();
-    }
-    
-    
+   
     @Override
     public void updateProgress(int reads)
     {
diff --git a/src/megabasterd/KissVideoStreamServer.java b/src/megabasterd/KissVideoStreamServer.java
index 6a5c21021..e15f78b5a 100644
--- a/src/megabasterd/KissVideoStreamServer.java
+++ b/src/megabasterd/KissVideoStreamServer.java
@@ -187,7 +187,7 @@ public final class KissVideoStreamServer implements HttpHandler, SecureNotifiabl
             }
         }
         
-        String status="Kissvideostreamer on localhost:"+STREAMER_PORT+" Info: "+conta_info+" / Conn: "+conta_connect+" / Stream: "+conta_stream+" / Retry: "+conta_retry;
+        String status="Kissvideostreamer on localhost:"+STREAMER_PORT+"  Info: "+conta_info+" / Conn: "+conta_connect+" / Stream: "+conta_stream+" / Retry: "+conta_retry;
         
         swingReflectionInvoke("setText", _main_panel.getView().getKiss_server_status(), status);
     }
diff --git a/src/megabasterd/Upload.java b/src/megabasterd/Upload.java
index c99c568e6..6b5409507 100644
--- a/src/megabasterd/Upload.java
+++ b/src/megabasterd/Upload.java
@@ -858,11 +858,7 @@ public final class Upload implements Transference, Runnable, SecureNotifiable {
         System.out.println("Uploader BYE BYE");
     }
     
-    public synchronized boolean chunkUploadersRunning()
-    {
-        return !_chunkworkers.isEmpty();
-    }
-    
+ 
     public synchronized void pause_worker() {
         
         if(++_paused_workers >= _chunkworkers.size() && !_exit) {
diff --git a/src/megabasterd/UploadMACGenerator.java b/src/megabasterd/UploadMACGenerator.java
index 9d45c25bc..41460f102 100644
--- a/src/megabasterd/UploadMACGenerator.java
+++ b/src/megabasterd/UploadMACGenerator.java
@@ -123,7 +123,7 @@ public final class UploadMACGenerator implements Runnable, SecureNotifiable {
             String temp_file_data = "";
             boolean new_chunk=false;
 
-            while(!_exit && (!_upload.isStopped() || _upload.chunkUploadersRunning()) && (_bytes_read < _upload.getFile_size() || (_upload.getFile_size() == 0 && _last_chunk_id_read < 1)))
+            while(!_exit && (!_upload.isStopped() || !_upload.getChunkworkers().isEmpty()) && (_bytes_read < _upload.getFile_size() || (_upload.getFile_size() == 0 && _last_chunk_id_read < 1)))
             {
                 while(_chunk_queue.containsKey(_last_chunk_id_read+1))
                 {
@@ -187,7 +187,7 @@ public final class UploadMACGenerator implements Runnable, SecureNotifiable {
                     new_chunk = false;
                 }
 
-                if(!_exit && (!_upload.isStopped() || _upload.chunkUploadersRunning()) && (_bytes_read < _upload.getFile_size() || (_upload.getFile_size() == 0 && _last_chunk_id_read < 1)))
+                if(!_exit && (!_upload.isStopped() || !_upload.getChunkworkers().isEmpty()) && (_bytes_read < _upload.getFile_size() || (_upload.getFile_size() == 0 && _last_chunk_id_read < 1)))
                 {
                     System.out.println("METAMAC wait...");
                     secureWait();