X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fredact.rb;h=6b505f28cee7daf61c92aa53a9362b2a10bb38e4;hb=18c7ac35df71363a579ac51d0d075a7161b22093;hp=70f6770e8af618abdc24b9f62ddd1595ce611aba;hpb=2815a23df18ddbaf3e0be81e013f869658829e61;p=redact.git

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 70f6770..6b505f2 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 35 2005-04-25 17:14:49Z tilman $
+# $Id: redact.rb 45 2005-06-08 18:02:12Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -179,7 +179,7 @@ module Redact
 		attr_reader :filename, :image, :id
 
 		def initialize(filename)
-			@filename = filename.to_str.dup.freeze
+			@filename = find_image(filename.to_str).freeze
 			@image = Imlib2::Image.load(@filename)
 			@id = -1
 			@source_type = 1 # COMP
@@ -207,6 +207,16 @@ module Redact
 			 "source_param" => [@source_param],
 			 "id" => [@id]}
 		end
+
+		private
+		def find_image(file)
+			[".", OPTIONS.image_dir].each do |d|
+				f2 = File.join(d, file)
+				return f2 if File.file?(f2)
+			end
+
+			nil
+		end
 	end
 
 	class CollectionDirectory < Array # :nodoc: