X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeleteAlbumPage.java;h=391e9ff8f4f1eb51860dd2a6d13f44715e3e017a;hp=d03e0656e61b4234b839545370576cb5c825c6e8;hb=c2e868714435ac7c75d77d1911d0dfb00393d051;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2

diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
index d03e065..391e9ff 100644
--- a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DeleteAlbumPage.java - Copyright © 2011 David Roden
+ * Sone - DeleteAlbumPage.java - Copyright © 2011–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ public class DeleteAlbumPage extends SoneTemplatePage {
 			if (album == null) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(album.getSone())) {
+			if (!album.getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
 			if (request.getHttpRequest().isPartSet("abortDelete")) {
@@ -62,7 +62,7 @@ public class DeleteAlbumPage extends SoneTemplatePage {
 			}
 			Album parentAlbum = album.getParent();
 			webInterface.getCore().deleteAlbum(album);
-			if (parentAlbum == null) {
+			if (parentAlbum.equals(album.getSone().getRootAlbum())) {
 				throw new RedirectException("imageBrowser.html?sone=" + album.getSone().getId());
 			}
 			throw new RedirectException("imageBrowser.html?album=" + parentAlbum.getId());