From d56e8ec9eaf4fa20c16d41768e0f83c9673e9e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=97=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Mon, 30 Nov 2015 16:16:06 +0300 Subject: [PATCH 1/4] =?UTF-8?q?Do=20not=20depend=20on=20MFC=20Signed-off-b?= =?UTF-8?q?y:=20=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=97=D0=BE=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=20=20(github:=20OZ1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Telegram/Telegram.rc | Bin 5540 -> 2769 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 58e43fa2420be95863224316d36942992d4d8f6e..1ecd730361c67eb534408458a8d3c6630db9b696 100644 GIT binary patch literal 2769 zcmcImUvJtl5PwJFJKVCDRznb=o7BgU7#1~65J^xgAw?M&uofI-n{}1?;dc%p3vI_H z4g3<{`R;swes@l%1NUq$a+xm`OqtxJ8Q7mb!HRM!QbiXasLXd_PC?EE+p2c6(djfB z9~qx#y9EW~aNb@U%?2JU=#p^?);Nq}#|@GRv7Es79+U9#eh_$})<5IgyVL2wsPcFz z@(rjpg@`;vu5Wv>L!eg$@+N{O#xaP}|1-K)7xtQUHZhi0Q&XF{_vAS2grHUL)*vNIDwOMG;!+320n z_zicXLW?mIGmh$o$-1Hb2}6I<`AGQ!%YqBTsd}eMoA&R_$kgb>yWDxs4>>DIcw%Y| zS^h+&0@r~bX||)V&C)rJgC!HlRXI>DcY;E?-DYf_DwcC#r7eWpCS_a#(vnF+ zvkc@jk{gLV=sIrV+JWEILD!b%)yQgVgvA&dvW&{vEEQ@t)A#j0e`(_v>u{99Qyp;T zL|&veK=>+Sat&88XL<~W3a7FB|4t@;{HBwMKl0r0>+eo38A*)O`clA~QXvsE2kcG5 zWJ)HX8~BOq4+AI(y~h?Cx*jPxV76{s-G0kN_IMIFu^qj0q7{aoH45*o@D9wM{iUZL zt)-qyi9-hQsI*!Lp+Hxk(@fG=e6!%|<}43_5T$QS)4aix!m;RaOpvD~3mWHPja3^w z123@ezzCIKe5HZx@})+u#&}JvAorr?jd^R{eA83v&>ycXk literal 5540 zcmd6r+in{-5QgVEK;MCpZxST1WhW_+OIwmvq4ELN0S#claBRylYRiIF$^po;xA}fj z^zKT#ZYmeWVzDBZ91j0EaAv5#|Jt%Gb9P`ic41Syw}f|OGscFDB{sKnyXC84uXvnY z+m(%Zr;N{NFBzNCYTcaP1%1btxZT(Unoaw~p0Uf8Z#NhnGkXj5rKhc}tlzXxR`b+a zx#8(Xew}#l+OhSlZv$&u$ByjGPOQaflm4M~?E@n{eh+MqkuLqXzc5tqiRfbMtc_ll zbv!~#_jZT;GqfW;^pW}xemh9rKu+nS#rO{IvPJ&c2IpA)>tbDA|JBo2L=?PZj;`cM zBjjGsH=^bv-)glHox{)PoUDYCaE{E*UgSnz7T7(>oT3}Aq35~NbP11L+sBW>De7@z z25@cQNoV*|mq&cR^SIKLeR!PUwc;`0yuI|hb{RcnbU@qoo*73XT@T+C&1-n~pxa}& zuts~gz_rV07ax}ng0&?@xwUl`hRER!Z%spMu&RFTZhE-W8OF1YfJhxC?(4Wx?jq~4GTp_F7 zL8A&Hfg<2mJQNb;OyLQuRkf&YN$lHV_Kr5>K_TuCtvbXx)eJgOk3Es@F`DdLjcAru zL;K*n1zm!_pMri0O7$eKuq zmVIsSdAIEizjeQl;~sMY$0mAgkZtpP%htpl_I<6?2H^o!Qjdy9E55>i#Ej4=7pJvS zsHpbXtG(ELl~drb{jmNDFHg`_Ubb}SKwr<$s}k3)`4vat3$$;+sORlsO{%dzH@0Im zm*<(zhx)LXs<`4&HF<<)r5Q!!88%nuxW-B$B6s*2;RE>^q?lWb?|H70q>g3Pe&jdL zDP2=kk;U2A4zZ(daneBz+`8>eh$Le&*dgs5mZw#k)q$=!T_R=~$%CtI?_rW0^Fny9w=RL0v zH+fxxtH=J-{jM5#IIIg(r4cgmmmAj zV)b58Es3&dB$>Wr`_zB0bkAF^nDYN#MO|i5RI4w9VH+Mb{D4~6={ Date: Mon, 30 Nov 2015 16:16:06 +0300 Subject: [PATCH 2/4] =?UTF-8?q?Do=20not=20depend=20on=20MFC=20Signed-off-b?= =?UTF-8?q?y:=20=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=97=D0=BE=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=20=20(github:=20OZ1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Telegram/Telegram.rc | Bin 5540 -> 2769 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index da9e0cb32f80976b6f0636bb2d99a7ee2d15221e..47e1ea11ca72966bfeae08054698761e636962f2 100644 GIT binary patch literal 2769 zcmcImUvJtl5PwJFJKVCDRznbIJE@N$F)V6G5J}J~Aw?M&uofI-n{}1?;dc%p4Qt0H z4g3<{`R;swes@l%10yyUxy+XercCbA4D3&zU`06IYt^_0PEW?sPgZtUO+d zd;@AtAtGNR*SEdcA<(M=c@x1C;}}Hg{~28?^0ecakW<;XKt5oylai$zuJ)VjDt1|v zh%Mp6zD$cNYw#6I6bA9cCW+&D*YNTJ^~1=T43kM5UN;+_7xtQUHZhi0Q&XF{{lCqvh7HUL)*vNIDwOMG;!+320n zc!j%Bp~aYq8AtWPWZlrs2}6I<`AGQ!%YqBTsd}eMoA&R_$kgb>yWDxs4>>DIcw%Y| zS^h+&0@r~bX||)V&C)rJgC!HlRXI>DcY;E?-DYf_DwcC#r7eWpCS_a#(vnF+ zvkc@jk{gLV=sIrV+JWEILD!b%)yQgVgvA&du#C#tEEQ@t)A#l6KDY6UbvR1lsSY@E zA}>-KAbgcExrVElGd+ewh0|F6e2QU#3B87SXwQFP@t>NX(s7!e6!%|<}43_5T$QT)4au#!m;RaOpvD~3mWHPja3^w zeJ`*dzzCIKe5HZx@})+u#&}JvAorr?t$AAT-vwI8lrH8GpoZqr9R`bw0x#8hP z{+w{{S=V~jw}Bm6%Q|*upRB>^A>$Kk+pnzj_&v6LR@#gseeqDeFLD=qXHE37tm6?{ zy0<&zpP?P;p^wy``E4Qf0dh(o4c2#Q%NF@(8=PbHuZwee{Z~(8k)z-pb95z78X@<3 zz7aJa@m8yk+&TPw&do}=3FpY{>{V{%b%EWJ%q_a{8u}@Bn=ZkzXGi!^xJ5l~%mAzh zc+wgE)aDc3zxiD0$v!wf;kCjs;J&@~RNJhcusWb`de4k25w3^t3T6}BJ>d4C7S4!v z1HSfHZR6w8L9n)@D7Uum!Vnoga{ADpsFp3W+(f&^zU)TFef4T}v{iQZwZD(-O&=9B zbBnJy%AVTJBGNX{T+oOV zk~^k&5`!!}+~dgI_so>@RVTFY z8)tv`I$`cJ(*%ffUkRu>Q0AU4U}v0kUc;&^l%*Vy6TVxZE*Q_~#f|gxEMFn3-2tNt zA^{@st#~L-lrzOoIIXHhbxUG@Eq3qdLmm{zEuvM6IH#IHH|nu3!aW9)-K!DJ(rV}k z{%+we!QW5eehQZwNnY`~YwzqmoP~L~59MCCZVsrH7iPJM{uVtlyH}lY4L&k&Q3fR~sVL8NUsx8C58X5Q-Hi)FU0@M1Ci(>!bssg$5f-Fpey{ zX&-2H?)oOP0NsT`hgdWq4)vdSCQ>-^wNeufkExP+R6L^c)!qdifSKP z%?0&UOaVjv;rta|o}jC|Y$@dczmtJiB`&J@6CL;quy5f}-`mBRRAYT!Y+W>$$C>Vj z`mh+PxZ+VY*+H|?j3V+3n=5l%W2F$0Tg*oIK)wbk#unpy9;+nT!LsUq<2R2fJyTSX z#ogEsv7=sb(m@Tr_1c>dNycQb6Z$(WQS6PVJ)G9BzByH{~`RX}`Rp`ET-RHsV)nEa|f?#O25SvsissR7;{P sHA*gyB*E4}lUE2jLvS5cQ)E~+&ahvoi0Cc5aIvie`us@;X@2T1*sLI3~& From d858e9635220d79fa0cca9c826b8f30172eef6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=97=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Thu, 10 Dec 2015 17:19:46 +0300 Subject: [PATCH 3/4] =?UTF-8?q?Do=20not=20depend=20on=20MFC=20Signed-off-b?= =?UTF-8?q?y:=20=D0=9E=D0=BB=D0=B5=D0=B3=20=D0=97=D0=BE=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=20=20(github:=20OZ1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Telegram/Updater.rc | Bin 4370 -> 4370 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Telegram/Updater.rc b/Telegram/Updater.rc index b55372ad83ebca332b8f7829be9b1afa5a83e86e..4c166b94045b89886bd3aad772da1cb7f151ba93 100644 GIT binary patch delta 29 fcmbQFG)ZX#4-;!SLncGsW Date: Thu, 10 Dec 2015 17:33:59 +0300 Subject: [PATCH 4/4] fixed crash in groups uniting --- Telegram/SourceFiles/history.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 28854b397..2504c9c45 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -1987,12 +1987,7 @@ void History::addOlderSlice(const QVector &slice, const QVectortype() == HistoryItemGroup && prev->type() == HistoryItemGroup) { static_cast(prev)->uniteWith(static_cast(till)); - till->detach(); - delete till; - if (blocks.front()->items.isEmpty()) { - delete blocks.front(); - blocks.pop_front(); - } + till->destroy(); till = blocks.isEmpty() ? 0 : blocks.front()->items.front(); } if (till && prev && prev->date.date() != till->date.date()) {