(txt2html): add utf-8 marker.

[lilypond.git] / flower / file-path.cc

diff --git a/flower/file-path.cc b/flower/file-path.cc
index 727ea046caa07bb32a09f7bb0a7c0eb4a4fcdccd..ddadfaca5bd0a43190f58f84d48389fc8abf0bd1 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -68,13 +68,11 @@ is_file (String file_name)
   return !S_ISDIR (sbuf.st_mode);
 #endif
 
-
   if (FILE *f = fopen (file_name.to_str0 (), "r"))
     {
       fclose (f);
       return true;
     }
-
   
   return false;
 }
@@ -132,8 +130,8 @@ File_path::find (String name) const
       if (file_name.dir_.is_empty ())
        file_name.dir_ = dir.to_string ();
       else if (!dir.to_string ().is_empty())
-       file_name.dir_ += ::to_string (DIRSEP) + dir.to_string ();
-       
+       file_name.dir_ = dir.to_string ()
+         + ::to_string (DIRSEP) + file_name.dir_;
       if (is_file (file_name.to_string ()))
        return file_name.to_string ();
     }