From: naru <bottle@mikage.to>
Date: Wed, 23 Apr 2003 14:28:40 +0000 (+0000)
Subject: Fix: existing ghosts are falsely marked as *
X-Git-Tag: SVG2-2~5
X-Git-Url: http://git.osdn.net/view?p=winbottle%2Fsvg-dll.git;a=commitdiff_plain;h=ca03a560a9965ece3e99e14ef9c875b58c096cf6

Fix: existing ghosts are falsely marked as *
---

diff --git a/SVG.dpr b/SVG.dpr
index 6af7074..50218c4 100644
--- a/SVG.dpr
+++ b/SVG.dpr
@@ -47,7 +47,6 @@ begin
 end;
 
 // DLLƒAƒ“ƒ[ƒhŽž‚ɌĂ΂ê‚éB
-// ‚½‚Ô‚ñ‚â‚邱‚Æ‚Í‚È‚¢B
 procedure Unload; cdecl;
 begin
   Ghost2File.Free;
@@ -85,9 +84,10 @@ begin
     ALine.CommaText := Lines[0];
     if (ALine[0] <> 'GHOST') then
       Exit;
+
+    Ghost2File.Values[Ghost] := FileName; // ŽŸ‚©‚ç‚̃Vƒ‡[ƒgƒJƒbƒg
     if (ALine[1] <> Ghost) then
     begin
-      Ghost2File.Values[Ghost] := FileName; // ŽŸ‚©‚ç‚̃Vƒ‡[ƒgƒJƒbƒg
       Exit;
     end;
 
@@ -171,11 +171,9 @@ begin
       if SameText(Key, 'sakura') then
       begin
         SakuraName := Val;
+        Ghost2File.Values[SakuraName] := FileName; //ŽŸ‚©‚ç‚̃Vƒ‡[ƒgƒJƒbƒg
         if SakuraName <> Ghost then //•ÊƒS[ƒXƒg‚Ì’è‹`ƒtƒ@ƒCƒ‹‚Ȃ̂ŃpƒX
-        begin
-          Ghost2File.Values[SakuraName] := FileName; //ŽŸ‚©‚ç‚̃Vƒ‡[ƒgƒJƒbƒg
           Exit;
-        end;
       end else if SameText(Key, 'surfacefile') then
       begin
         Result := Val;
@@ -287,6 +285,11 @@ begin
     end;
   end;
 
+  // ƒS[ƒXƒg‚ªŒ©‚‚©‚ç‚È‚©‚Á‚½Œ‹‰Ê‚ð‹L‰¯B
+  // Œ©‚‚©‚Á‚½ê‡‚ɂ̓tƒ@ƒCƒ‹–¼‚ŏ㏑‚«‚³‚ê‚é
+  if Result = '' then
+    Ghost2File.Values[Ghost] := '*';
+
   // “à•”ŠÖ”Bghost.txt‚ð“ǂݍž‚ށB
   Dir := ExtractFilePath(GhostFile);
   Ghosts := TStringList.Create;
@@ -316,8 +319,6 @@ begin
   finally
     Ghosts.Free;
   end;
-  if Result = '' then
-    Ghost2File.Values[Ghost] := '*'; // ƒS[ƒXƒg‚ªŒ©‚‚©‚ç‚È‚©‚Á‚½Œ‹‰Ê‚ð‹L‰¯
 end;
 
 // Ghost‚ÅŽw’肳‚ê‚éƒS[ƒXƒg‚ÌSurface”Ԃ̃T[ƒtƒBƒXƒCƒ[ƒW‚ðŽÀÛ‚ɓǂݏo‚·B