X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Option.pas;h=9e13e50f8c0425fecadc2375076961ca1d20b9d4;hb=67d1e848e222a31ef21e869aa310f32634cf8008;hp=64c637f4b31109e0f683ead65d3a30c7677f06d5;hpb=7e88af8d4ce277ba43a0d9f9464e1aa682aa38ef;p=gikonavigoeson%2Fgikonavi.git

diff --git a/Option.pas b/Option.pas
index 64c637f..9e13e50 100644
--- a/Option.pas
+++ b/Option.pas
@@ -1321,6 +1321,14 @@ begin
 	sndPlaySound(nil, SND_ASYNC);
 	if OpenDialog.Execute then begin
 		SoundFileEdit.Text := OpenDialog.FileName;
+        // ƒAƒvƒŠ”z‰º‚̃tƒ@ƒCƒ‹‚̏ꍇ‘Š‘΃pƒX‚É•ÏŠ·‚·‚éB
+        if (AnsiPos(GikoSys.Setting.GetAppDir,SoundFileEdit.Text) = 1) then begin
+            // .\ ‚ª‚‚©‚È‚¢‚̂ŁA.\‚ð’ljÁ
+            SoundFileEdit.Text := '.\' + ExtractRelativePath(
+                                      GikoSys.Setting.GetAppDir,
+                                      SoundFileEdit.Text);
+
+        end;
 	end;
 end;
 
@@ -1328,10 +1336,8 @@ procedure TOptionDialog.SoundPlayButtonClick(Sender: TObject);
 var
     s : String;
 begin
-    s := SoundFileEdit.Text;
-    if (AnsiPos('.\', s) = 1) then begin
-        s := GikoSys.Setting.GetAppDir + Copy(s, 2, Length(s));
-    end;
+    SetCurrentDir(GikoSys.Setting.GetAppDir);
+    s := ExpandFileName(SoundFileEdit.Text);
 	if not FileExists(s) then begin
 		MsgBox(Handle, '‘¶Ý‚µ‚È‚¢ƒtƒ@ƒCƒ‹‚Å‚·', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
 		SoundFileEdit.Text := '';
@@ -1357,7 +1363,8 @@ begin
 	Item := SoundListView.Selected;
 	if Item = nil then Exit;
 
-	if FileExists(SoundFileEdit.Text) then
+    SetCurrentDir(GikoSys.Setting.GetAppDir);
+	if FileExists(ExpandFileName(SoundFileEdit.Text)) then
 		Item.SubItems[0] := SoundFileEdit.Text;
 	if Trim(SoundFileEdit.Text) = '' then
 		Item.SubItems[0] := '';