From 23b6a2a4585375146ea89f4d4aa0602452eff569 Mon Sep 17 00:00:00 2001 From: lsv Date: Wed, 27 Sep 2023 20:58:06 +0500 Subject: [PATCH] fix issue#36 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлена проблема видимости кнопки "завершение процесс клиента" в окне Состояние сервера. Проблема связан с изменнием числа аргументов у функции pg_terminate_backend --- db/pgConn.cpp | 2 +- x64/Release_(3.0)/pgAdmin3.exe | Bin 13996032 -> 13996032 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/db/pgConn.cpp b/db/pgConn.cpp index f092fbd..c246b17 100644 --- a/db/pgConn.cpp +++ b/db/pgConn.cpp @@ -571,7 +571,7 @@ bool pgConn::HasFeature(int featureNo, bool forceCheck) features[FEATURE_ROTATELOG] = true; else if (proname == wxT("pg_postmaster_starttime") && pronargs == 0) features[FEATURE_POSTMASTER_STARTTIME] = true; - else if (proname == wxT("pg_terminate_backend") && pronargs == 1 && set->GetLong(wxT("arg0")) == 23) + else if (proname == wxT("pg_terminate_backend") && pronargs >= 1 && set->GetLong(wxT("arg0")) == 23) features[FEATURE_TERMINATE_BACKEND] = true; else if (proname == wxT("pg_reload_conf") && pronargs == 0) features[FEATURE_RELOAD_CONF] = true; diff --git a/x64/Release_(3.0)/pgAdmin3.exe b/x64/Release_(3.0)/pgAdmin3.exe index 2873a93c69557c3ae1161f82f6b5c14544874e72..407ef75a4efd63ffdb5ca687b5f23ba8c8cb225d 100644 GIT binary patch delta 1542 zcmZ9}e^gUt9LMo{9gyX^xN_o#(v-QaSs;)<`k@XIo5qhqDKpC~GYTn^tt>^Rg9gp% zQuA6FQKp5cp#>w9oFj-*6Tv#C(!V;Do&M-V#y_0n?R^J_o%-W-p55=B@8|j6`*<3@ zPw=4GCXQ(?@Y+S6T~v*M262c-0Sw1pdvWQpZi!7#dB6|b+(!NTTJo9oz?=eP%ny`CL zw)dL2DML0|q#1^IN2~aU#*sNV*g4)Md4K*>-D^|y3*=Q6DQQi5tXn(Wt;?+$bZfhP z1sXvRf6p8~WM*vJFNWwLbJauKnGA5XcX$9oGg2Z#(0j&Ix6*8K29}v^i~Z-X^vFM2 zBvbMJDG|X@J?J93FdE$ zDf&xv1>48+_rgHVkdrMPC2GH`C^svd)u$E?%kylKp=#%Fed1_+3kA<97jG=Mb%Z92 zhMFfuguFm*8^x(3bMgr->QULp#5{l487OwD(I?gqD8Z3y`z<-5Ui!MD8(H$5ioQEZ zy^h4);aXpjMo1Z{o@N^@>g=r}KQ}1)Ci!ohWY!4t2jtB=jE2xqsd2j~H#l?ReO-15 zi5L$ZZo_8B2U?+BAH{Qe^$k>aw@HXDT zKD>*1yoUz7j}NdPAL0NG;v;;F#!#32P(_6}POdy#o9-*AKNKpdZ*t5Mb9{~cO*o7r zIEqiujAJ;CPw^RA(25Y+@HyIX0w>XdFK`NBoJItl_!3>{##iVGHTHkq84_pv%KYEp Z49?;lzQuX;;sW~6kBgx)|989M{snBhvKs&Z delta 1536 zcmZ9}Yg80v9LMn)7w|@dSS#*=w92wL$Q|C`2O$6EO*sF$Gf*i>p+JC~cS{Zd7)rNLld(QG(#|ow_7+ zhP2v1T%A?vPmwN)(-qY!T^5s+1F4ctysTVcv78mz>o=ASRI?OX*JwtMIVjWxsutyV z{}!t<6|+s6YmUi@J3KOMaAuB-^h|S0-d}##H`_Ji5@o$jN{CI5v`*OW&HB^%@mVYWA6*lPK1w^$&i_OgD=X3@%j|jK=*fNZDm{95Ib+pFa{p2q(j-&t zzDVT<6^f z=XX)Ggy-akrs_xKbclt%fXiRv(xbaKg|x=-eO*ipj$QY`Ei6SY&DfiuUryYfK)qaS z5R${y0NZHMXYUL@Zq|&gO2{r*4O(_cscA5q)X_4tUsRf1xzTd3LqZ&;As*9lHLigX zGmwCpFu{yOBw-ekaV;#EjX6kx6{)Zx4R%}y2j=2>%tJadFdsJ{6Ir+s3vd$_Vi9h} zEw~knk&Pv|4Nl}B7q=r1`B;i&aG?NqU^xm=gcVqcRk#zyxC^UMg1d1K*5F>O#eG`Gm;6ZG_LwFdE;88q=jVQ(Acmid366JUb6?huYU=u3gMirjLbJ&dM@dCEsMO32( zTj9YrY=;-MsKZN;QI8#X89wZUAFrSRjo5`(u^W5v8eWHjy?6s}VjteZ+i1c&XvVwP zkN5CCKEQ|g2p^+G?RB(PR*F-U>NE8ja%oemTH4g+Tp;GjErV_N1P5>spQ0Td_za)p z5IS)fD!On4-8hP4IF2uH0s(x9AbRi>deMiIIHk4>e%+&r3*~a(H#m(m_!ehz4*fWf O0Sw}TTJHO9cho;49kPG`