From 38e7db52d5fb5d1bcb17a73437844f3301bd9c68 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 19 Apr 2001 23:19:19 +0000
Subject: [PATCH] Moved Close loop to FormClose in hopes of fixing close
lock-up problem.
---
src/sbbs3/ctrl/MainFormUnit.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/sbbs3/ctrl/MainFormUnit.cpp b/src/sbbs3/ctrl/MainFormUnit.cpp
index 3ed714e23d..54d568e8e4 100644
--- a/src/sbbs3/ctrl/MainFormUnit.cpp
+++ b/src/sbbs3/ctrl/MainFormUnit.cpp
@@ -645,6 +645,14 @@ void __fastcall TMainForm::ViewToolbarMenuItemClick(TObject *Sender)
void __fastcall TMainForm::FormClose(TObject *Sender, TCloseAction &Action)
{
SaveSettings(Sender);
+
+ time_t start=time(NULL);
+ while(TelnetStop->Enabled || MailStop->Enabled || FtpStop->Enabled) {
+ if(time(NULL)-start>30)
+ break;
+ Application->ProcessMessages();
+ Sleep(1);
+ }
}
//---------------------------------------------------------------------------
void __fastcall TMainForm::SaveSettings(TObject* Sender)
@@ -827,7 +835,7 @@ void __fastcall TMainForm::FormCloseQuery(TObject *Sender, bool &CanClose)
return;
FtpStopExecute(Sender);
}
-
+#if 0 // Moved to FormClose()
time_t start=time(NULL);
while(TelnetStop->Enabled || MailStop->Enabled || FtpStop->Enabled) {
if(time(NULL)-start>15)
@@ -835,6 +843,7 @@ void __fastcall TMainForm::FormCloseQuery(TObject *Sender, bool &CanClose)
Application->ProcessMessages();
Sleep(1);
}
+#endif
CanClose=true;
}
--
GitLab