summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
diff options
context:
space:
mode:
authorJonathan Bauer2014-10-28 12:39:54 +0100
committerJonathan Bauer2014-10-28 12:39:54 +0100
commit2d47444515b3f8056f98df6c2436af722a58c0e0 (patch)
treedd1584e5a7c46acc3936917918e4dd41c53dc670 /dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
parent[client] fixes "fertig stellen" button not beeing activated when download fin... (diff)
parentBug behoben: GUI erkennt nun wieder einen abgeschlossenen Up-/Download (diff)
downloadtutor-module-2d47444515b3f8056f98df6c2436af722a58c0e0.tar.gz
tutor-module-2d47444515b3f8056f98df6c2436af722a58c0e0.tar.xz
tutor-module-2d47444515b3f8056f98df6c2436af722a58c0e0.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java')
-rw-r--r--dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index 49da4e01..c2799052 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -556,12 +556,13 @@ public class FTPSearchDownloader_GUI extends JFrame implements
}
// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
- if (isCurrentlyLoading() == false) {
- // not uploading currently
+ if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) {
+ // not downloading currently
+ //LOGGER.info("finished downloading file");
btnDownloadStoppen.setEnabled(false);
btnMainMenu.setEnabled(true);
} else {
- // currently uploading, don't let user interact
+ // currently downloading, don't let user interact
btnDownloadStoppen.setEnabled(true);
btnMainMenu.setEnabled(false);
}