Fixed a null pointer exception bug if merge was called without any se…

…lection.
fluffynukeit · Oct 14, 2011 · 7084c42 · 7084c42
1 parent 2b3ee6c
commit 7084c42
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/com/fluffynukeit/SpriteClipper/SpriteSheet.java b/src/com/fluffynukeit/SpriteClipper/SpriteSheet.java
@@ -72,7 +72,7 @@ public void findClips(SpriteClipFinder clipFinder, BackgroundFilter filter) {
 
     public void mergeClips(Collection<SpriteClip> mergeClips) {
 
-        if (mergeClips == null) {
+        if (mergeClips == null || mergeClips.size() == 0) {
             return;
         }