Merge pull request binford2k#70 from binford2k/fix/fix_rmagick_crasher

Fixes the nil dereference when imagemagick is used
patmaddox · Jul 22, 2013 · cff9e8d · cff9e8d
2 parents 0112b72 + d6ad783
commit cff9e8d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/showoff.rb b/lib/showoff.rb
@@ -388,7 +388,7 @@ def update_image_paths(path, slide, opts={:static=>false, :pdf=>false})
     if defined?(Magick)
       def get_image_size(path)
         if !cached_image_size.key?(path)
-          img = Magick::Image.ping(File.join(".", @asset_path, path)).first
+          img = Magick::Image.ping(path).first
           # don't set a size for svgs so they can expand to fit their container
           if img.mime_type == 'image/svg+xml'
             cached_image_size[path] = [nil, nil]