github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-08-21 06:12:43 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

fix crash server status frame

Browse source
This commit is contained in:
levinsv 2019-09-11 23:15:08 +05:00
parent a12676df94
commit 3a9372c45f
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Release_(3.0)/pgAdmin3.exe
View file

Binary file not shown.

41
frm/frmStatus.cpp
View file

@ -2310,25 +2310,28 @@ void frmStatus::OnRefresh(wxCommandEvent &event)
void frmStatus::checkConnection()
{
if (!locks_connection->IsAlive())
{
locks_connection = connection;
}
if (!connection->IsAlive())
{
delete connection;
connection = 0;
statusTimer->Stop();
locksTimer->Stop();
if (xactTimer)
xactTimer->Stop();
if (logTimer)
logTimer->Stop();
if (querystateTimer)
querystateTimer->Stop();
actionMenu->Enable(MNU_REFRESH, false);
toolBar->EnableTool(MNU_REFRESH, false);
statusBar->SetStatusText(_("Connection broken."));
if (connection) {
if (!locks_connection->IsAlive())
{
locks_connection = connection;
}
if (!connection->IsAlive())
{
if (locks_connection==connection) locks_connection = 0;
delete connection;
connection = 0;
statusTimer->Stop();
locksTimer->Stop();
if (xactTimer)
xactTimer->Stop();
if (logTimer)
logTimer->Stop();
if (querystateTimer)
querystateTimer->Stop();
actionMenu->Enable(MNU_REFRESH, false);
toolBar->EnableTool(MNU_REFRESH, false);
statusBar->SetStatusText(_("Connection broken."));
}
}
}