閉じるボタンが灰色のままになる不具合の修正

diff --git a/Editor.pas b/Editor.pas
index dd70195..9743a2d 100644 (file)
--- a/Editor.pas
+++ b/Editor.pas
@@ -596,7 +596,10 @@ begin
 
        sysMenu := GetSystemMenu( Handle, false );
        EnableMenuItem( sysMenu, SC_CLOSE, MF_GRAYED );
-
+{
+  EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+  DrawMenuBar(Handle);
+}
        Indy.Request.CustomHeaders.Clear;
 //     Indy.Request.CacheControl := 'no-cache';
        Indy.Request.CustomHeaders.Add('Pragma: no-cache');
@@ -642,6 +645,8 @@ begin
                                        Board.SPID := '';
                                        Board.PON := '';
                                        FWork := false;
+                                       EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+                                       DrawMenuBar(Handle);
                                        Exit;
                                end;
                        end else if ResultType = grtCheck then begin
@@ -669,6 +674,8 @@ begin
                                        Send(Board.SPID, Board.PON, False);
                                        Exit;
                                end else begin
+                                       EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+                                       DrawMenuBar(Handle);
                                        Board.SPID := '';
                                        Board.PON := '';
                                        FWork := false;
@@ -714,7 +721,9 @@ begin
        finally
                Source.Free;
                TextStream.Free;
-               sysMenu := GetSystemMenu( Handle, true );
+               //sysMenu := GetSystemMenu( Handle, true );
+               EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+               DrawMenuBar(Handle);
        end;
        FWork := false;
        if State = gdsComplete then begin
@@ -726,7 +735,6 @@ begin
                        GikoForm.AddMessageList(FThreadItem.Title + ' [\83\8c\83X\91\97\90M\8fI\97¹]', nil, gmiOK);
                Close;
        end else if State = gdsError then begin
-        Self.Repaint;
                if FThreadItem = nil then
                        GikoForm.AddMessageList(FBoard.Title + ' [\90V\83X\83\8c\91\97\90M\8e¸\94s]', nil, gmiNG)
                else
@@ -1234,17 +1242,16 @@ end;
 //ReadSambaTime \82ð\8cÄ\82Ñ\8fo\82·\82ÆTimer\82ªOn\82É\82È\82é
 procedure TEditorForm.SetSamba24(AURL: string);
 var
-       tmp: string;
+       Protocol, Host, Path, Document, Port, Bookmark : string;
 begin
        //Samba24\91Î\8dô\82ð\82µ\82È\82¢\82È\82ç\8fI\97¹
        if not GikoSys.Setting.UseSamba then
                Exit;
        //Host\82ÌURL\82É'.2ch.'\82©'.bbspink.'\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82½\82çSamba24\91Î\8dô\82ð\82·\82é
-       if( AnsiPos('.2ch.', AURL) <> 0 ) or ( AnsiPos('.bbspink.', AURL) <> 0 ) then begin
-               tmp := AURL;
-               tmp := StringReplace(tmp, 'http://', '', []);
-               tmp := Copy(tmp, 1, AnsiPos('.', tmp) - 1);
-               FHost := tmp;   //FHost=\8eI\96¼
+       GikoSys.ParseURI( AURL, Protocol,Host, Path, Document, Port, Bookmark );
+       if GikoSys.Is2chHost(Host) then begin
+               Host := Copy(Host, 1, AnsiPos('.', Host) - 1);
+               FHost := Host;   //FHost=\8eI\96¼
                ReadSambaTime(FHost); //\88È\91O\82Ì\8f\91\82«\8d\9e\82Ý\8e\9e\8aÔ\82ð\93Ç\82Ý\8d\9e\82Þ
                //StatusBar\82É\82±\82Ì\8eI\82Ì\8bK\92è\92l\82ð\95\\8e¦\82·\82é
                StatusBar.Panels[2].Text := 'Samba24\8bK\92è\92l' + IntToStr(ReadSettingTime(FHost));