TEditor、TTaskTrayの配布先変更に追従

[winbottle/winbottle.git] / bottleclient / BottleSstp.pas

diff --git a/bottleclient/BottleSstp.pas b/bottleclient/BottleSstp.pas
index cd78a18..20246e9 100755 (executable)
--- a/bottleclient/BottleSstp.pas
+++ b/bottleclient/BottleSstp.pas
@@ -219,19 +219,18 @@ begin
     FLastTickCount := GetTickCount;
 
     try
-      FCueLock.Enter;
+      FCueLock.Enter; // \83N\83\8a\83e\83B\83J\83\8b\83Z\83N\83V\83\87\83\93\82É\93ü\82é
       try
         if FCue.Count = 0 then Continue;
         BottleRef := FCue.Items[0] as TLogItem;
-        // \83R\83s\81[\82ð\8eæ\82Á\82Ä\82¨\82©\82È\82¢\82Æ\81A\83N\83\8a\83e\83B\83J\83\8b\83Z\83N\83V\83\87\83\93\82ð\8fo\82½\8cã\82É
-        // BottleRef\82Ì\8eÀ\91Ì\82ª\95Ê\83X\83\8c\83b\83h\82É\82æ\82Á\82Ä\89ð\95ú\82³\82ê\82Ä\82µ\82Ü\82¤\89Â\94\\90«\82ª\82 \82é
-        FProcessBottle := TLogItem.Create(BottleRef);
-        if FProcessBottle.LogType <> ltBottle then
+        if BottleRef.LogType <> ltBottle then
         begin
           FCue.Delete(0);
-          FProcessBottle.Free;
           Continue;
         end;
+        // \83R\83s\81[\82ð\8eæ\82Á\82Ä\82¨\82©\82È\82¢\82Æ\81A\83N\83\8a\83e\83B\83J\83\8b\83Z\83N\83V\83\87\83\93\82ð\8fo\82½\8cã\82É
+        // BottleRef\82Ì\8eÀ\91Ì\82ª\95Ê\83X\83\8c\83b\83h\82É\82æ\82Á\82Ä\89ð\95ú\82³\82ê\82Ä\82µ\82Ü\82¤\89Â\94\\90«\82ª\82 \82é
+        FProcessBottle := TLogItem.Create(BottleRef);
       finally
         FCueLock.Leave;
       end;
@@ -248,6 +247,7 @@ begin
         // \82Å\82Í\91\97\90M\92v\82µ\82Ü\82µ\82å\82¤
         Source := TStringList.Create;
         try
+          Opt := '';
           if Pref.NoTranslate then begin
            Opt := 'notranslate';
           end;
@@ -256,11 +256,11 @@ begin
             Opt := Opt + 'nodescript';
           end;
           Source.Add('SEND SSTP/1.4');
+          Source.Add('Charset: Shift_JIS');
           if FProcessBottle.Ghost <> '' then
             Source.Add('Sender: SSTP Bottle / ' + FProcessBottle.Channel + '/' + FProcessBottle.Ghost)
           else
             Source.Add('Sender: SSTP Bottle / ' + FProcessBottle.Channel);
-          Source.Add('Charset: Shift_JIS');
           if FProcessBottle.Ghost <> '' then begin
             Source.Add('IfGhost: ' + FTargetSetName);
           end;