fix for infinite loop if less images

2015-05-25 21:24:19 +08:00 · 2015-05-25 21:24:19 +08:00 · 6da1ceb13f
parent 269f7c5121
commit 6da1ceb13f
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/galleries_controller.rb
+++ b/app/controllers/galleries_controller.rb
@ -44,7 +44,7 @@ class GalleriesController < ApplicationController
      albums.each do |album|
        total_images = total_images + album.album_images.count
      end
-      total_images = counts > 9 ? 9 : counts
+      counts = counts > total_images ? counts : total_images
      while images.count < counts and images.count < AlbumImage.count
        albums.each do |album|
          img = album.album_images.sample