From 3a9372c45f90108cc9d99d95ca348d46aacc2755 Mon Sep 17 00:00:00 2001
From: levinsv <44033647+levinsv@users.noreply.github.com>
Date: Wed, 11 Sep 2019 23:15:08 +0500
Subject: [PATCH] fix crash server status frame

---
 Release_(3.0)/pgAdmin3.exe | Bin 10447872 -> 10447872 bytes
 frm/frmStatus.cpp          |  41 ++++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Release_(3.0)/pgAdmin3.exe b/Release_(3.0)/pgAdmin3.exe
index 5eadb5dc36bac51ad685ed4f802c67c883d50ae1..c2716f95828b9c751a57373886566bf5cbbc66ca 100644
GIT binary patch
delta 1079
zcmZA0NlX(_9DwoZLR)O1MFEil+Q9`xal?h(A}DSsiio%tT<fmXg+;0b3XT>PaTF_h
z@Sw&-O-$xSATfr-gP3?QlBmaCjCwOJsozxNfx|Cv-uHibGnetc`>prlsY#>rEk4_0
z*4&D2IjR%pw$=+NR~>fWu*N^EQE8!r9#JsB2os_)4rW*ogIHK$Lmb9q0^*T?L`*~y
zCLtMiq#zY(n2agPu*R|1Bv;hOT3Z*4=JuEB1;N@@s1XDyP|kCxHtS=!ZO~(pI@D2D
zhZ?1T`Wz~bjI8Ze_4I(6atGA0$I#WUuK7P3Y|`sc#odqL&7oCw*@EwdUJBfd;+n{N
zq&TUhDm)?uf+Q(!$G_b@cKNRwjQ_{?$A$-E!&|~ew<nx1t7w$3GwIa(qzi+rY986&
z-1}G_oSc<tkiNex`=ybGn({K@rGTIwSRYO>tsWIFuYJ(D{g>=AJJRJ(U-U-Z5?8kD
z44Pc>S9ht=Z?rfRqec8+)?SL1hw|*1iY-Yj(`g?^c4_jX6fs%uwu?Wt&;AyLVzg*K
z$H?E_m&}yCv&B^9M}}Cd*CxhBl0xzrv~IK9T_7gNwueT&-<BgH9aAw4(=h`X$iz%!
zVHRd18*?xh^DrL^kb{L-gvD5bT;w4i1t>%jim?<<lwcW3QHJGMfpV<GDy+sDtVIRZ
zVLd9b0UJ?;O^Pk2T8h!!_XnNT*o+!%K`pjo8@6Kyc48M?s6#z=V-NOXANJz_+&G9s
zIE*7WieosA6F7+mcyJ1*aRz6VptJFL4S!8#Un82(j24_jE4(<53-F;0?dX6Xo#?_v
lNVtT{2%sBRa240kgX`$U4am5OTj;}W1aU{H?CXE><`1myj7$Ik

delta 1009
zcmZ9~TTskV9KiAaUTU{?S6hj6WB+d56}cr*ib^87$t4wC-7A+wsdl&g*(5oY@ZzB`
z>A}qZ&1A-mJe3(^3`Vazo_J-<`nH~U_{=%yd*;mV<#c@ft?$63QKS1X+c;p-4EyEV
zBq^!AT8ikmg?CMBoYR_lTIisM4}4*O5q|K831(QZ00FQf5J3pWLWE!u79$i(5QcC>
zAQDknie>7w##Un#6V0L4q8z;>x$EQRJl#_*X2p@kvDYyl71#XUUEsY6uv;{wm-ET)
zX|^ge?#4%Ro>F&hRif1OTCcc<d?e|O_qimAr~bBxV*A@>gA%A@7I|hB*JG~#31k0<
z_k;$ip~VvtpZ=NYMjZnKmCh+vZ=bDe8+;~QhNxUoVY2xMtB-6JjxRxBVzNgctjnuR
z6v;FGP2zh)mceN-+f;*D{%X?p`iWPm;W4T;RL<6E$GxX0@gzbH6Mf<GFYUzNqEZZI
z?Kg|~@hLM_bR@`;>d$DoT(1pY;7uy2#aCNv5`AfMh_H?u^iFGvjOAE?l~{$<h(-)z
z5r=prAQ5Yjgk-G6I;3DdHee$*VKY*(1!>rdbZo<RWFQkekcDjQ#4h9@7kSu?eC$C1
z_F^9ju^$Iegksg2QleNiW6sfx5|pA02T_hgIE*7WiV7S<C8|)3<2ZpD)S?dcXh0)Q
z;uKEf49?;l&Z7y<Xu$<s#3fu-M>ASql=0^aM_O?OZMceSXh#RGqZ3`|h8+$#(Su&x
lfP$O21sD2o8~wP00o=tP?m=J(!x+JRjN*Y>IP&oMyFcxubDaPH

diff --git a/frm/frmStatus.cpp b/frm/frmStatus.cpp
index ab46452..91d7320 100644
--- a/frm/frmStatus.cpp
+++ b/frm/frmStatus.cpp
@@ -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."));
+		}
 	}
 }