X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=89823a81786f4158e8bc0eff21a411f3fa06217a;hp=5e5d08a4accd5fe5c1c9e64693f0629d230ac4b0;hb=e71cce762443757a193067b13a82fb7ae92b28b2;hpb=6615e6c00106a2934a0b4b6ea2c73ab5da230837

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 5e5d08a..89823a8 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -166,6 +166,9 @@ public class Album implements Fingerprintable {
 			image.getAlbum().removeImage(image);
 		}
 		image.setAlbum(this);
+		if (images.isEmpty()) {
+			albumImage = image.getId();
+		}
 		if (!images.containsKey(image.getId())) {
 			images.put(image.getId(), image);
 		}
@@ -180,6 +183,13 @@ public class Album implements Fingerprintable {
 	public void removeImage(Image image) {
 		Validation.begin().isNotNull("Image", image).check().isEqual("Image Owner", image.getSone(), sone).check();
 		images.remove(image);
+		if (image.getId().equals(albumImage)) {
+			if (images.isEmpty()) {
+				albumImage = null;
+			} else {
+				albumImage = images.values().iterator().next().getId();
+			}
+		}
 	}
 
 	/**