From 4ae519ec40795c486d9a35a0023e7eec2a8cc59e Mon Sep 17 00:00:00 2001
From: Arun <arun@Aruns-MacBook-Pro.local>
Date: Wed, 17 Apr 2024 22:19:52 +0530
Subject: [PATCH] fix hidden window property browser crash issue

---
 .DS_Store                                     | Bin 8196 -> 10244 bytes
 3rdparty/.DS_Store                            | Bin 0 -> 6148 bytes
 alphaplot/.DS_Store                           | Bin 6148 -> 6148 bytes
 alphaplot/src/.DS_Store                       | Bin 0 -> 12292 bytes
 alphaplot/src/ApplicationWindow.cpp           |   8 ++++++--
 .../core/propertybrowser/propertybrowser.cpp  |   2 +-
 build/.DS_Store                               | Bin 0 -> 6148 bytes
 data/.DS_Store                                | Bin 0 -> 8196 bytes
 fitPlugins/.DS_Store                          | Bin 0 -> 6148 bytes
 9 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 3rdparty/.DS_Store
 create mode 100644 alphaplot/src/.DS_Store
 create mode 100644 build/.DS_Store
 create mode 100644 data/.DS_Store
 create mode 100644 fitPlugins/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index d532df828134dd66d0d2d73423700f3ff5d20f63..765f32d618288aadccecfb5e5bd9993dc5647208 100644
GIT binary patch
literal 10244
zcmeHMO=uHA6n@i0v(Z+H_;V5$MetB-TK^EG#5N*5sHG8$sMMs1X>hX}@?()w$<?2m
zCokT-h<}LaK@VQ^tOvab3O$GiQS{Q2elxq-%<OLJMMPu<cHd^-_h#Sw-pt#b2@$c;
zW?_iPBq9R`m;JpsMKrGGN2v99clJRt*weV>%;YU6kKg?vw7#Jk&<tn>Gy|Fe&A`9F
z0N&ZW8LM5X&zb?vfM&pFfY%2T2bXD2wp=Mn2To!M02#+^(Qqw3{UJ?$12XN&mMd`w
zjk%_ft|{}D7|dHaFxMRVw1;oG(lsY0o{WCHCo^w_!n}nCGX<Pj+LijO8PE)b8Q^R8
zI1N&X%G6NT?`#RW!JncDLmy|AhO#qGrONO2Y<_zk!q-)tOvc*-Ft)A#HnL;!<snsH
zSXN)1mHOTyW^<zLAI(ye@&PY5p$M#zybPdaUx{L$;7b4@d%Wp#Y~<QU;c*Dn@w+=p
z_MY4lX3#FGQGu$IgKW?x)qmpb$SjBO`MG-4WAtghYL)AaRO%h;iN#l}Oc)7cwQ)8(
z>&#^vxkj@-nya1WzfL%gm2Y3?@+Zs1x#|9OV~*X(mF;3p7?cY|K+a5+?SeBm>NM>_
zUD#$_g^@Ip)BPLg=ZAI=n0r#g3j^l-{^8VsxqH{%g@vTCe(TNylhYThitSuM2x!c!
z&D7`q_Rm*w6$(p9%;typqcC!6KF8wi)P(w~IGyAyhf~sHzTggq`ns5{*_LCMpyTl*
zkv0p-n}w|6$_Y*rdH|H1zzB=~BZU!xDM>u|{Yf-oavGm~egA5}tqBqR$%$MZsibmz
z0uPQ#RUnyt;bfw=R533dbyhM|6(y-_yIZ1%Ce^7(wLl-&0)4EYJdkA!qJoO-;e$;c
zLK0G8nASZ8Qqs!I-np4*PY?ysnHtdug-P<591{cH#(SYC27O8OSX8ZBQq^5WGng7S
zokx5nkJEC%hEEjPCP8C#91lE2<8+LUsA!P^868Ir&7pqg0yxfcBu-|I-TSf@IKK~>
zw>LL7w0V>C9oC}sGG}Z_yrou&*c*t)LYDda)TVmCSN=woeT}q{{U)0E0h>si9K+&W
zKZY*YPCUQE%CQl>#^Y%vRlvQCxKIq$n8etXV^XkcEaIDA(aSOPKJsG-U^>2c!>B%s
zd?aa-4r82V=qThMA_&YnK8Bh6<q*f{Dq<!FzJqvykH)Fd-5vo`ejjpVQ_ua#Bz-5U
zD7_ld2c8ApGy|Fe&46Y=Gw>%Eh`F7ZeE<J&_y7O@#G`Z{ngPwgKgs}$XR?`5IM?34
z3Hr(R+D#niaPY=)EmsN?oWyoKq}Yzf556709S6szxa1AjX-~FXi92Y2{m%etGe@ug
X)s@BsPe>9gbIy@o|6?TopX>i$n|VGd

delta 141
zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7-OXH$S8BWF7(S$?FC5CYJ~a
zZmtt#XWT3+tjjq0mB{wVieh^vcZ!Qn&JvfO94o;)*-k=!@>7ZM$q!W&HdY8T3o-+Z
g0|E(dAmIu!d1K*s=E?jjfgFqw`xrLI^UPre0N0ft_W%F@

diff --git a/3rdparty/.DS_Store b/3rdparty/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1d90e217fd6829de7e892006757956bb21a952ec
GIT binary patch
literal 6148
zcmeHK%}N6?5T4jQtQJcT9;6`b3n=ylWR)uPCiE`aA8K*it+hRP+p84B2N8S#&%S}+
z**6e8c+_u_Sd#Ac=cFPTn0(n}X43EL?q)+o;$YM)6BUWbhckL>XfllF*;BTnM>c>$
z*62~2I@F_9HA+Rh0jGdd;IApb&+aO<s83gDjpsLR)T6kLS$;L_!*@QVp_iEvwac|e
z-0jPGar~Se)r~6^UDv<A&Fzg}pSX6$FX+b2B_sRi=E@2G0H3-v0;e+?NM3_#Wbt`G
zjL9bzZ?Va}oMhEBxg0%CxTI>COy<Q|JiG);Ql2iU0VY>8q!^s~6aj}e8?l8*lg*4Q
zi&Lp^GrPXYZ2e=xY(`y^-{NSCWoegL7Qk{y+h7_?egp9A;OYW*<kUYW##3D9=30#D
z`hC$_Chs@j`@TEpu3@rYHpkL{?pTB0FznfEeqNz#odQk)r@%x3em?|o#!zFTP`*0Q
z$RhyI!>}~;`GbLT0*#@@L?LEiLZt##s?bLaq0%uP=(td0qEMxi(1#D9R~Gt&BIN3*
zAINYLp+eU>1)Ku50y%YA<o*9}_W9pVa#v0Pr@+5bKzNl}<p7lQ-kKuEdu;$eg|l&7
nqEM!w(c7`?@K(GDmxj53JHSw5q7Wl6_aPu<aE(*oM-})2uzBL?

literal 0
HcmV?d00001

diff --git a/alphaplot/.DS_Store b/alphaplot/.DS_Store
index b763c9782f358294a1a21993db344e9c2a4f2f2c..833189ef031d28b276a629f25f7d68548cc2c604 100644
GIT binary patch
delta 132
zcmZoMXfc@J&&a(oU^g=(_hufJ_l#*d>4w3{`MCuQAYfCT0VJ6jiW!O+l5_K2T#|C~
olYk-|bDX$Dxt|<$M3zm#BU_MxWU9vkhRq*YmoaW;=lIJH0OTGbWdHyG

delta 32
ocmZoMXfc@J&&a+pU^g=(`(_@N_l%pf+2$}#Y$({w&heKY0Ihop+5i9m

diff --git a/alphaplot/src/.DS_Store b/alphaplot/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5e5d47488e9d1817af132c22458c3efb06c17a3e
GIT binary patch
literal 12292
zcmeHN&u<$=6n<+bv7MNtX_^WlKt5KeiU_@Ms@&j$BJop30&zf19OI_4vsU7WlmiM#
zz@aDpfs#J}!3FM-5aNJT@h?>3fDmxv0vGt+?8f`v^Q`Skh(kLY?aq4ly>H%p@6F7c
z$r4etak#Tibcu+{IJrDm#pP3?+5$>(@OwT-jv}5!IB(#@{W+qTwrPvHbU<r(Ht8rp
zfc0l^R;U9#sef~`8@IN*@iyK9nyx|kkAK{OUtOHx2n+-U0t118z(8Q&!5QGW7f0F5
z_sP?64GaVZ9%%-6e5m2%vYwX5N$G|TTsVd2_ngAJ1NWS)^Rrr7*3<GhDe(qJl&GRi
zRHJl>5hdz)UQ6ZbX?dKKi8@8DX5geXN9hVBa<$`m&52V~Ps(r&3<L&78MuN+=V_CA
zShshmP1os&`dEkW(|{USWp}WWZ{bPbtj51a7t2=T-08<-nALprl+j;x`e!v?qb9w8
zC!4Tg*X=08d6q<X4ARO}NY<XeMo?Zx&3j<vb#M{Wd-&DGuQzcY<Ic-Up<_^%X%dRD
zgLgR!?+$l4c;kgV!<Kk!B=|we&(kZAAHe2ac+#uG+$){3(J?kL!%Dsi`P=jsYS?ix
zGsvk2oGLxG&FY!Dm_emerdPrD0L**a;`q8J_?i>)2HSBZWmoAnM0Ok8CO*D}`<9FQ
zNioL^N~D#kkc>T!SBbI+JJ@&J+I?8HftKg_khzt*)f`<@r{h=Z&4U5ncN?JPF=DNU
z>z?WBh{@tr!Le7T+gWe6;$A-)VxIW~rB|*OHyY`#Uipi^=dRwl|2^>YWOt^P?cbF3
z*Vzo_Gie*g>IdL<9}(-1BlIKHM&{F}Yxv~8r1UD-`)s-1*9WKEZ#$Yz_WC3Z#bx2{
zlW2<vS2FqWdg+WwuVlvKcuB=#(K)k%F>ed|x;*-Mxr-2sszoKGVHo2GRMIO#x(Uv>
z2ke4HzP8*>vTy$3nEXn_<nlxmV+W503gK}ewCQbuqvygY#sr0T@d5CRZ7xP+>n@C7
zHDN1{6fVN@SaP0`IOnIpF}65=NsK2ZVoaPFc+{SGT6k}id)q#ZX>4R)D!f%^;}Q6I
z5#!mun?nZ}PY)eu7~ygmLw{CC9Gz{9!sC&QJ?uY)Qb5hSW*k7T8I@5zzqm7tp6_&J
zU;p!?VP8+*Wxd<JQ~i17Cmt0`^gg2IZ00`DR<XC0RYqFbNAEO8@ua22&xe*8oL-#S
zoG+!Ur&G2*9D#wrKwuy+@ZT_S88CD79M;+CIzZ0{JX6z}n5mVlnhmP^-&rg<7yS0w
z!s^1$F4tEWawf==QS-p!395n3S8{DeHehTPvdZSdOV3*@Y4h*j3Y!Inv^h^k*<5fl
zZv|{_BOl=`#Ggqc`%spbl!hnEP|{^3?aerh{1!4H{$ArY@*(8h+V`9bjF(qj&Yo~K
zPzIjDlzjepZ}x1J;*rZTf^l++*V417l2*}f>`<W{ykbb!51iw1&bWt6Cq~BO<r{iL
zcSUrsOoe3pz}crlxiA&VsDIe|(wd9FIly0xR`KeCv;8D@ooZK1VX;lqV41e@3PRyj
zu`kE_Uz}Bs*`IK+Bil0X(KB_yLW&lJH<px6mb?3X2`?z^$8xnzy>2g3);j~fxqWTj
zA2_R5H4NocKPZ3s4LBRVlkxxSFT?m3@3Xk~y;t#GIRP{+W8~v#*upL;uL37W1H7m#
zUmA;G_+eiv?M1ArlAblOX6Mrng-@$Fx~5L<Q<2o0cPqIrdNc2hc_YC2QR<Y9j;X`>
zQ_9a_mzSgL(Bpe%FjrRjzk2@&K2lgR2HyB#xaVbLvN*_-QL(Ue%CWG39a!#-*>`uI
z-4f@)%=%=HgNRp`I4&*VavfXvIp6;|p>PQd1O^^X2BMipv$27;MLF%`|Fzd}-oVK+
zr#Sh*y;H$OeF%Wx?%(k!U4oX%*3<GhDV-_+lK<rYZyy4zk(~#Scd7YpI5&s+pTEWk
M^FQL_p_~8z1<Pxm;Q#;t

literal 0
HcmV?d00001

diff --git a/alphaplot/src/ApplicationWindow.cpp b/alphaplot/src/ApplicationWindow.cpp
index c08d7fc2..fd2edf3b 100644
--- a/alphaplot/src/ApplicationWindow.cpp
+++ b/alphaplot/src/ApplicationWindow.cpp
@@ -5557,6 +5557,9 @@ void ApplicationWindow::hideActiveWindow() {
 void ApplicationWindow::hideWindow(MyWidget *w) {
   hiddenWindows.append(w);
   w->setHidden();
+  propertybrowser->populateObjectBrowser(nullptr);
+  customMenu(nullptr);
+  customToolBars(nullptr);
   emit modified();
 }
 
@@ -5573,7 +5576,7 @@ void ApplicationWindow::activateWindow() {
   raise();
   show();
   WindowTableWidgetItem *it =
-      static_cast<WindowTableWidgetItem *>(ui_->listView->currentItem());
+      dynamic_cast<WindowTableWidgetItem *>(ui_->listView->currentItem());
   if (it) activateWindow(it->window());
 }
 
@@ -5638,6 +5641,7 @@ void ApplicationWindow::removeWindowFromLists(MyWidget *widgrt) {
   QString caption = widgrt->name();
   if (isActiveSubwindow(SubWindowType::TableSubWindow)) {
     Table *table = qobject_cast<Table *>(widgrt);
+    if(!table) return;
     for (int i = 0; i < table->numCols(); i++) {
       QString name = table->colName(i);
       removeCurves(table, name);
@@ -5681,9 +5685,9 @@ void ApplicationWindow::closeWindow(MyWidget *window) {
   if (subwindowlist.isEmpty()) {
     customMenu(nullptr);
     customToolBars(nullptr);
-    propertybrowser->populateObjectBrowser(nullptr);
   }
 
+  propertybrowser->populateObjectBrowser(nullptr);
   emit modified();
 }
 
diff --git a/alphaplot/src/core/propertybrowser/propertybrowser.cpp b/alphaplot/src/core/propertybrowser/propertybrowser.cpp
index 00ef6815..8ec4a94a 100644
--- a/alphaplot/src/core/propertybrowser/propertybrowser.cpp
+++ b/alphaplot/src/core/propertybrowser/propertybrowser.cpp
@@ -114,7 +114,7 @@ void PropertyBrowser::populateObjectBrowser(MyWidget *widget) {
   } else if (qobject_cast<Layout2D *>(widget)) {
     Layout2D *gd = qobject_cast<Layout2D *>(widget);
     objectItemModel_->buildUpGraph2D(gd);
-    connect(gd, &Layout2D::addedOrRemoved, this, [=]() {
+    connect(gd, &Layout2D::addedOrRemoved, this, [&]() {
       MyWidget *active =
           qobject_cast<MyWidget *>(app_->d_workspace->activeSubWindow());
       if (active == widget) {
diff --git a/build/.DS_Store b/build/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..641ebdbd3007c083f439af66a62011bb8b9b1201
GIT binary patch
literal 6148
zcmeHKOHRW;47E$3K}e`ema}I=FMvW7PS6WLTZtkyqyizf*|TGXxCE!*Al!uKu@y3e
zc8L(!lIKnQnVGyqaZE%!xnGQlMnsfD1qb^Wz7g?@_GDldak8wjx*AXCb+ztAy5YAn
zAkQwNOS+{wEz{?>x7+nqby?0<^$fQB_<4Bx`2Kd5`WIXM>t*-dI6*26>4C24h89#~
zc9-sc_}Y)?p5f`GJ;RrEs`~RJo1@b61UZk3GvEw31OJ5q)NGObK+#8Mz!`7`S_b6%
z5TJsEVWSv79T;K@0L);Hg1Ph(k`oLI!$uJv2x}@(Q`uS!)^yl|#TAB)qNWpD^TD<=
zTZh7NcdQ>`IB}uqqch+Pqzvrn<w)xP`R4vVP4X*ez!~^c3~*LX%L#7DYHRQ2q}B%L
q1yn@h8pSpRlURxoE2a1d8U^+s6JTN3D8d5qAAv}N56-}kGVlSGH%OTP

literal 0
HcmV?d00001

diff --git a/data/.DS_Store b/data/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5b61e06baced67228f88aab74f754d963e79449b
GIT binary patch
literal 8196
zcmeHLJ#Q015S=BqIb?!DkWeagB@Ge&1L%lMK?6l3>Lh35M6!LS*omM(9CcdgDWIc4
zLiq=l5HuA00e%2dS~}kB?%nO!cZLRp$gZ_Jr=7Pu&u>3Yb3~-Jj(Q!U4I&Cq*{-$G
zR224eT__i9&rMi`@iZKCw&P@!E+Bn}SHLUa74Qmp1-t_PiUN3Na|vqR`^M{AuYgzJ
zTq?l#Lx{>YvNkhTUma+43IN+cw=Q^I;|JK#+Q{0>Sa?vB847ELDw|>`GaUV)#YNU;
z#+u=zZ1SOOWMwlHrK4m1P{T<@#`@MP;1yU@fOGc-_2_^mG?n>#<AduPCEf1cFxf+2
z@aFx+J15^}ccs6#)SvFV-v;z4ZPH^(XiQU@h{zA#eaFm>*Nwe-66CQ3qKsaR5b+<r
zMgT-Opjb1I@z;NBO0OF~K3y&27vo1s8NV7K;y=30@mn;aUHtzev_qkQxmbnY<?#I0
z)tti|reslv5j@Og+oBXoJke}Y$z$cS=IQud9``#A4}mFp)L|-kw6O<cI;1{+V?6I;
zZRYpJY_I}GHAt7+$5-pQMz!dY<*(6#@9c|NzX_BZV)ejP=+^xDOzY<OU2dOF3vMlp
zE#`1{Q5{C`XrARfrt}m{`g12KxWcbRj#2ns9_<&`a*gINr80FG!DDrYd0a-6L%pLX
zT9qkw6`yZ;x{hz`F2lO~-j1*5{A%ZRHTxaB;C-Aj?@M~`51~?wJ=f=RAXbwGQ8mit
zdiJv5S}~u?aye4)!`AS{EAWRD;F}a>gY*A;_22(B$TwaAufYGQfNFHNyIc5gHn(2*
zmz-;ds5_`!7?&BVhoI5vIIK>`VQo6Du_2&5CbBj&7Ck6`{X>A8hxqruUIX8pKLvgQ
DB@=`A

literal 0
HcmV?d00001

diff --git a/fitPlugins/.DS_Store b/fitPlugins/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..cb17702db1904b01aeaabe4799ec1323639c60c4
GIT binary patch
literal 6148
zcmeHKO-=$a6n<4=h!_LLpbHm00&@W~lJNp^02NR$4h&IH6F0LrG4TK-#*GUXp2CB8
z3zvScZD0xv3=54heaY)r+V?u&`{t*Vh(vYJ^oWW?l!r6s*3rx`o@bx36*IC86l#rY
zI;B1h=nCk}Dc}_N>k9C@yGdtsM?E^G<onyF3yP>4w!B&+>hyFWrKd&lohS(EVN^$4
zemE@eKYV^1EY4{zozrV4c}ZM?)=V8Cm{0Qlnw(GaEWC_(T5EKoF|V|k89X-V91Qw&
zq`rnqMf5_d*jkqF!6`L1$#3s<#BWagm}{1Jn|FovOIzEsdG9>Vi%s&bzb)kLB{j|x
zKZAD(&u$2XyVRgdJjJ)@-{4sY;azIsPPFX`whE{qLsqhu=l4-9nKH+BW4TPbJ_({f
zX4tdY@~nn4r+`zyDUeivzYh}5=o^eRs!s<Rbp!zBFsuxHK1*<pH0T?QHDU%PbShA%
z3UkB|IvwNE#Q6qejXIr#IeZ9nWnoSzLR}r}OBGJS*XUZOfK$L$U{(Jt^8SCAe*U+U
z+%KnqQ{Z1IAaX%1sG=mZw@wwud#!|@z}Yx1)~Hg@nC)0~cq`t8E5n@R4$wCkYs3i5
P{Si<yxW*~)s|tJrg#6f~

literal 0
HcmV?d00001