summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
diff options
context:
space:
mode:
authorSimon Rettberg2019-10-15 15:14:34 +0200
committerSimon Rettberg2019-10-15 15:14:34 +0200
commit915bf9c68c728d4a3fed8a82ebc01c8b28591adb (patch)
treed3cc87369d9f268bd9033608508d9e3b41d945d7 /dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
parent[client] Change update-button text in login mask if update is available (diff)
downloadtutor-module-915bf9c68c728d4a3fed8a82ebc01c8b28591adb.tar.gz
tutor-module-915bf9c68c728d4a3fed8a82ebc01c8b28591adb.tar.xz
tutor-module-915bf9c68c728d4a3fed8a82ebc01c8b28591adb.zip
[client] LoginWindow: Show same update notification as in main window
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
index 365d1796..e7eb31c3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java
@@ -186,10 +186,12 @@ public class ClientVersion {
if (remoteThread == null)
return;
try {
- remoteThread.join();
+ remoteThread.join(5000);
} catch (InterruptedException e) {
}
- remoteThread = null;
+ if (!remoteThread.isAlive()) {
+ remoteThread = null;
+ }
}
/**