Channel select dialog pops up with all channels checked, when you are joining no...

diff --git a/bottleclient/BottleDef.pas b/bottleclient/BottleDef.pas
index 902f2cb..f1d988f 100755 (executable)
--- a/bottleclient/BottleDef.pas
+++ b/bottleclient/BottleDef.pas
@@ -290,7 +290,7 @@ const
   DefaultGLogPage = 'http://bottle.mikage.to/glog/glogview.cgi';
   DefaultVotePage = 'http://bottle.mikage.to/viewvotes.cgi';
   DefaultHelpPage = 'http://bottle.mikage.to/clihelp/';
-  VersionString = 'SSTP Bottle Client ver 2.17.1';
+  VersionString = 'SSTP Bottle Client ver 2.17.3';
   SentLogFile     = 'sent.log';
 
   BottleDisclaimer = '(C)2001 - 2002 naru/Mikage Sawatari'#13#10 +

diff --git a/bottleclient/ChannelListForm.dfm b/bottleclient/ChannelListForm.dfm
index 352de96..6873a83 100755 (executable)
--- a/bottleclient/ChannelListForm.dfm
+++ b/bottleclient/ChannelListForm.dfm
@@ -62,7 +62,7 @@ object frmChannelList: TfrmChannelList
     Align = alTop
     Alignment = taLeftJustify
     BevelOuter = bvNone
-    Caption = '\8eQ\89Á\82·\82é\83`\83\83\83\93\83l\83\8b\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢'
+    Caption = '\8eQ\89Á\82·\82é\83`\83\83\83\93\83l\83\8b\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢ (\95¡\90\94\8ew\92è\89Â\94\)'
     TabOrder = 1
   end
   object pnlBottom: TPanel

diff --git a/bottleclient/ChannelListForm.pas b/bottleclient/ChannelListForm.pas
index 297d36a..ec0bff6 100755 (executable)
--- a/bottleclient/ChannelListForm.pas
+++ b/bottleclient/ChannelListForm.pas
@@ -44,10 +44,11 @@ implementation
 { TfrmChannelList }
 
 function TfrmChannelList.Execute(List: TChannelList; Join: TStringList): boolean;
-var i: integer;
+var i, count: integer;
     Item: TListItem;
 begin
   lvwChannels.Items.Clear;
+  count := 0;
   for i := 0 to List.Count-1 do begin
     Item := lvwChannels.Items.Add;
     Item.Caption := List.ChannelItem[i].Name;
@@ -58,8 +59,16 @@ begin
       Item.SubItems.Add('\8eó\90M\90ê\97p')
     else
       Item.SubItems.Add('\92Ê\8fí');
-    if Join.IndexOf(Item.Caption) >= 0 then Item.Checked := true; 
+    if Join.IndexOf(Item.Caption) >= 0 then begin
+      Item.Checked := true;
+      Inc(count);
+    end;
   end;
+
+  // \83`\83\83\83\93\83l\83\8b\82É1\8cÂ\82à\8eQ\89Á\82µ\82Ä\82¢\82È\82¢\8fó\91Ô\82È\82ç\91S\90\94\8eQ\89Á\82ð\83f\83t\83H\83\8b\83g\82É\82·\82é
+  if count = 0 then
+    for i := 0 to lvwChannels.Items.Count-1 do
+      lvwChannels.Items[i].Checked := true;
   Result := (ShowModal = mrOk);
 end;