summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
diff options
context:
space:
mode:
authorSimon Rettberg2016-01-19 12:29:21 +0100
committerSimon Rettberg2016-01-19 12:29:21 +0100
commit96af8474789b3ed05ddd4ddcdbc3f7455e6797a2 (patch)
tree3e9910131245b0d8a7d8daa4fa6897b1db942e0e /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
parent[server] I'm stupid (add missing classes) (diff)
downloadtutor-module-96af8474789b3ed05ddd4ddcdbc3f7455e6797a2.tar.gz
tutor-module-96af8474789b3ed05ddd4ddcdbc3f7455e6797a2.tar.xz
tutor-module-96af8474789b3ed05ddd4ddcdbc3f7455e6797a2.zip
[client] Fix NPE related to location editor
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index ad5deb0c..b7e509cb 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -615,7 +615,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
|| chkHasInternetAccess.isSelected() != lecture.hasInternetAccess
|| chkIsActive.isSelected() != lecture.isEnabled
|| !lecture.defaultPermissions.equals(originalDefaultPermissions)
- || (lecture.locationIds != null && !lecture.locationIds.equals(locationInfo.locationList))
+ || (locationInfo != null && lecture.locationIds != null && !lecture.locationIds.equals(locationInfo.locationList))
|| (locationInfo != null && lecture.limitToLocations != locationInfo.limitToLocations)
|| imageLinkChanged;