From f177940bd487adf20ca2cbf56967c4ec333ed016 Mon Sep 17 00:00:00 2001 From: lsv Date: Thu, 26 Jan 2023 12:07:55 +0500 Subject: [PATCH] fix bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Устранено падение по нажатию F4 возникающее при определенных пользовательских настройках --- frm/frmQuery.cpp | 5 ++++- x64/Release_(3.0)/pgAdmin3.exe | Bin 13817856 -> 13817856 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frm/frmQuery.cpp b/frm/frmQuery.cpp index 18b5713..7b73a75 100644 --- a/frm/frmQuery.cpp +++ b/frm/frmQuery.cpp @@ -2515,6 +2515,7 @@ void frmQuery::OnAutoEditObject(wxCommandEvent &event) if (!mainForm) return; //parent->SetCurrentNode(parent->GetBrowser()->GetRootItem(), path); pgObject *obj = mainForm->GetBrowser()->GetObject(mainForm->GetBrowser()->GetSelection()); + if (!obj) return; pgFunction *fun=(pgFunction *)obj;//obj->Show //mainForm.propFactory->StartDialog(mainForm, obj); //showMessage(obj->GetTypeName()); @@ -2540,11 +2541,13 @@ void frmQuery::OnAutoEditObject(wxCommandEvent &event) pgObject *o=mainForm->GetBrowser()->GetObject(matchItem); //mainForm->GetBrowser()->SelectItem(o->GetId()); //showMessage(o->GetName().Lower()); + if (!o) return; if (o->GetName().Lower()==selText.Lower()) { //obj = mainForm->GetBrowser()->GetObject(mainForm->GetBrowser()->GetSelection()); mainForm->execSelChange(matchItem,false); - obj=o; + //obj=o; + obj = mainForm->GetBrowser()->GetObject(matchItem); if (!dlgProperty::EditObjectDialog(mainForm, 0, obj)) mainForm->CheckAlive(); diff --git a/x64/Release_(3.0)/pgAdmin3.exe b/x64/Release_(3.0)/pgAdmin3.exe index 19097000f13a34b7b6cc5e8701c765cbc77d407f..8bb55dcfd06c2d572e029c7f5cc973c48bd2cdd7 100644 GIT binary patch delta 2136 zcmYM!eN+@x7{~D)5m-=M(MCl{7hPA=OoBARQpm7T7c&Jk#e73W6bxJh%UTU+g=rEq zT`ld^1WgL9*nBGjOA0f@ETwbul${gh=}7&7o?|wB@5~Z^d=B^C`OR>j=g#cr+UAhW zs2wc@ZLDbBF;+Sl)+t#mC$H_dBy5lAU(z9YJ0zh8g3uGe2tg>U2tzn}p*JGX2R8IY zB>JI0?tqK|7>GfL!e9(RH15Pu41*mp7>*HeV5Gl8at>K1CHi{jJL5cM^|sQWV2ef3 z(l04$Q+u=2rdOVz3QKvWBUaJmKT}s*xS-45t*x?%^sihaU9G6++V>ghpzieIQ!CB% zfk3*>NT)f9MLf@lhjzz{JzLhA`JzDHYd$?e#FLD;tveomZIzjxZlv9d6m92jaRcH0 zMtE3vIKmkSN1I`aNpmP7+HMgwP7zU$S>(}?f$U#vM3L^`l(^1oLCJMeXQSP1E4g|_ z(OeEimmAhqSt>gl`?@1bu3lF(P5g6RK5VX9-F-@~-cYpE1YO=^F7*^Q-x4<$>vEa7 z)8^Qr_Qk6@W^2gZc3h`KTCpioi^-^FDnao^jhf52tFw*H(b0h!ciS?Vh zypVxH2cleRbE@hKyAj&UlW49L_6j_GxDl?OuKr+dx`BD6qP8%z>hf7*W>m8=Fr?Bv zb7(YTSzwty&FflLba^IYMfKXn+o*08)hepQq4_%2I|t4UxqVp|#aCiZ1im`R33l&lOmvyyUKB%A4T3?shu*L><4ZDV3W|rs)d(W63s5ZoWBwwpp{r4m)lWQeK zyR%OoJL_p*Zkr!<2^O%zs)x!+LEoye+PzEUH*-sqH0az_~OsD zZ@6$-cWHYaE&SB@CvI@gmVEX3{X+fzBIoK7sn8#D%h?$rUGxtM8`UyF%Ju&~d6a#Y zG}argjlyW$g)tCocVisx!Fa^tUc@0D_hAAi;(jFH0VHA)9>hbKj44P$G9JcMJc1NV z!=q3z9WyW!E~H`>9>Z)rjyaf%G^8T~^DrMzU;!2)6N~U97GnvPVi}er3oEb^tB{S= z$iW({MK1EN4o@K;1y~O^3b6r2D8@!Sjc2e4&*C|Fuo+wMJW5cCGQ0pUwxS#rQ1K!( zyo7D2#CE)l9e4#hu?s%z#vZ(i*RU7+@H*bWn|KRv;~nhByExzv*Q&<+Ar1D8i}a57 zW))TAAP(U@9QJ1w)l79sIlk(~nz)FZp?14{xWk?u{aoJ+-;{BO5`F1MYKD1}PS@al ze1KXU!BKpOkMJ?-;KwI8hT}MalQ@M>@fqszIU3N2)A#~k`jbwdX=#!Qy^&fIzQWgN U##wxWbNCi5IPZ_tTCdOe4;?~ss{jB1 delta 2096 zcmYMzZB!Ih9LMn;1X)mA(8e%HS6UYoO_MY-Q+%LCUGX6>%0~(W6*YAUOKs5wSDQvL zveB|KGeL{QN;jWsOEU^H)H;ct>U8LwC|^i#(4)tu@10rV#piJE-5+=U|9fZ3>l?e4 zqdryYay9u}b((Y_W{hOBoxHZsma%<6FMpd9Xp@8pbU`Gd&=t|JBL=bPhVF<%4>%By z1oT8N+yxoEaW@jt2lt>al5j8jp+B4$fMnbU7X}8~BzNBxQoP=MrF(==%e}0q4Xr;) zSB$C?6mQ!y*EL+x|i0D5y(c`$z=!t3DB~zva53Y2qP< ze8gI{dwcj>ZYbKc3`5>)Ek$}A{+8Q{=5ehtttH7D%lxt-FJ+!p z(e9|6$=NAtSE@2*qy zGNeb`i0uOw9 zqhBap*k^+1U3?4E8>|!Nw-UnQu-P}?8k)`KhL>q}O2;zIj@55^-L4+V$D0kszs@z> z=BW77rVlQ4XZRLGUNIE4&HS{?3yv)m2Sd%X^TIcfXzj$8YF%_|0nZ*^FDdFJv#eTP z3CB^ZpaA?6;*2x*OPv(b5sbm37>jYp#CS}=L`*^!9>e2MFd0)Y6&_4OHl||+W?~keKn`*-8&4t+ zPvL3I!CcJ4d@R61ADeddHtMD zXR^y#oRl3uTOT*{;AlPfa9#gE=9xNtghQyuVSJ2F@F|YqD1!J5$8a1ca1y8RIle#$ tU*apA#u