From 96af8474789b3ed05ddd4ddcdbc3f7455e6797a2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 19 Jan 2016 12:29:21 +0100
Subject: [client] Fix NPE related to location editor

---
 .../main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 
-- 
cgit v1.2.3-55-g7522