--- a/degal/folder.py	Wed Jun 17 16:45:01 2009 +0300
+++ b/degal/folder.py	Wed Jun 17 17:02:24 2009 +0300
@@ -135,10 +135,19 @@
     @property
     def page_count (self) :
         """
-            Returns the number of pages needed to show this folder's images
+            Returns the number of pages needed to show this folder's images or subfolders. May be zero, one or more.
         """
+        
+        if self.images :
+            return int(math.ceil(len(self.images) / float(self.config.images_per_page)))
+        
+        elif self.subfolders :
+            # paginate these?
+            return 1
 
-        return int(math.ceil(len(self.images) / float(self.config.images_per_page)))
+        else :
+            # nothing to render, really
+            return 0
 
     def images_for_page (self, page) :
         """