276322 2011-06-23 12:46:22 +0000 Unwanted fields show in ledger for investment. 2014-11-09 10:48:53 +0000 1 1 2 Applications kmymoney general SVN openSUSE Linux RESOLVED FIXED NOR normal --- 1 agander93 agander93 mtibouchi+kdebugtrack onet.cristian http://commits.kde.org/kmymoney/cd6b3c9a653096188097fba254360edda395a14f 4.7.2 0 oldest_to_newest 1134218 0 agander93 2011-06-23 12:46:22 +0000 Version: SVN trunk (using KDE 4.6.0) OS: Linux The problem shows best if the transaction form is enabled, but also is evident without the form. If an existing cash dividend transaction is selected, the form shows widgets for Date, Amount, Total and Status, which is what is expected. If that transaction is then opened for editing, additional widgets show for Security, Quantity and Price, which aren't expected for a cash dividend. If, while the transaction is open for editing, 'Dividend' is reselected, the additional fields disappear. Similar behaviour occurs for Buy transactions. Reproducible: Always Steps to Reproduce: 1) Enable the Ledger form. 2) Open a file containing Dividend transaction. 3) Select a Dividend transaction. 4) Only widgets for Date, Amount, Total and Status appear. 5) Open that transaction for editing. 6) Additional widgets show for Security, Quantity and Price, which aren't expected. 7) Reselect Dividend from the combo. 8) The additional fields disappear. Actual Results: As above. Expected Results: The additional widgets for Security, Quantity and Price should not appear. 1135382 1 agander93 2011-06-26 10:34:52 +0000 I've been looking at this, but am stuck:-( I traced where it is going wrong, but, to me, the code looks OK. In investtransactioneditor.cpp, InvestTransactionEditor::slotUpdateActivity(), circa line 835, the following code appears - dynwidgets << "asset-account" << "interest-amount" << "fee-amount" << "shares" << "price" << "total"; for (it_s = dynwidgets.constBegin(); it_s != dynwidgets.constEnd(); ++it_s) { QWidget* w = haveWidget(*it_s); if (w) w->hide(); } I can change the 'w->hide()' to w->setDisabled(true) and that seems to work, or I can insert a messagebox() before the 'for' statement, and then the edit boxes do get hidden as expected, but I haven't yet found a proper fix. I don't know if this is a timing issue, but, whether or not, what needs to be done? I'm clutching at straws here! Thanks. 1135627 2 tbaumgart 2011-06-26 16:27:38 +0000 One thing you could try is to replace w->hide(); with QTimer::singleShot(0, w, SLOT(hide())); If that does not work, try if replacing 0 with a value of 1000 makes a difference. 1135664 3 agander93 2011-06-26 17:22:51 +0000 (In reply to comment #2) > One thing you could try is to replace > > w->hide(); > > with > > QTimer::singleShot(0, w, SLOT(hide())); > > If that does not work, try if replacing 0 with a value of 1000 makes a > difference. Sanity returns! Thanks for that. I had remembered seeing this in the import area, looked at it and didn't pursue it. Instead I tried a huge for loop and that made no difference. The value '0' didn't help, so I tried 1000. The problem was still there and I cancelled the edit, and just as it closed I saw the fields disappear! So, I now have worked it down to 10. Problem now is that all those widgets are closing, but I need to clean up my code before I go any further. 1135957 4 agander93 2011-06-27 10:33:28 +0000 Making progress, but I've noticed something else. When a Dividend transaction is opened for editing, the fee category field is active, but there is no label. If a fee category is entered, the fee amount field becomes active - again no label, and if an amount is entered, the total reflects this change. However, when the transaction edit is accepted, the fee amount has been lost. I'm not clear on whether it is expected that a Dividend payment could have a fee, which sounds a bit unlikely, so I suspect that the fee account should not be active. If I hide it, though, the split widget shifts to the left. Before going any further, I think I need a second opinion, please, on what is right and what is wrong. 1135962 5 djhoulden 2011-06-27 11:02:15 +0000 I don't think a fee is applicable to a dividend payment and when entering a new dividend the gui doesn't show the fee field. A fee can however be applicable to a reinvest dividend transaction. 1136016 6 agander93 2011-06-27 12:42:44 +0000 (In reply to comment #5) > I don't think a fee is applicable to a dividend payment and when entering a new > dividend the gui doesn't show the fee field. A fee can however be applicable to > a reinvest dividend transaction. That's two for 'no fee'. Good. The GUI is what I'm working on at the moment, and there are anomalies. The fee amount is not shown, but the fee category selector is shown, and if an entry is made, the fee amount becomes active, but any value entered is not retained. 1136305 7 agander93 2011-06-28 10:02:39 +0000 I've noticed various other anomalies in the various investment types, to do with unnecessary fields, missing labels and one where it's possible to enter a value for a fee without a category, and which doesn't get retained. Also Bug 276315 may need to be revisited. The fix worked for Dividends, where no price is involved, but I think the odd currency/price wizard still shows for ReinvDiv/Buy transactions, where there is a price. 1136343 8 agander93 2011-06-28 11:35:47 +0000 A query about investment interest splits. A Buy transaction being edited shows the Interest split button, but ReInvDiv does not. The Buy split seems to work as I expect, at least in limited testing. In the code, the ReInvDiv split button gets hidden, which figures, but for others the following appears - // FIXME once we can handle split interest, we need to uncomment the next line // interest->splitButton()->show(); As the splits do seem to work, should that comment be removed, particularly as the button does in fact show. Also, and perhaps a bit more importantly, why no ReInvDiv splits? 1136562 9 agander93 2011-06-28 22:49:40 +0000 Sorry, but another query. I can't think of any reason for a Buy transaction to have an interest amount field, especially bearing in mind that ReInvDiv doesn't have one. I can understand them having an interest account field for a category. Unless I hear to the contrary, I'm inclined to remove it. 1139957 10 agander93 2011-07-09 17:53:32 +0000 I'm still finding the odd wrinkle :( The latest is strange and I haven't found a way to fix it. If I create a valid Dividend transaction and save it, then decide to edit it and make it an Add shares instead, when that is saved, the transaction is flagged as having a missing assignment, of the dividend amount. I haven't found a way to correct this, other than deleting the transaction and starting again. The reason I was changing a Dividend to an Add was that I have been finding widget problems when editing an existing transaction. Bearing in mind that the circumstances are somewhat artificial, is it acceptable to resort to deleting the transaction, or is there a better way? 1152030 11 agander93 2011-08-09 20:01:16 +0000 (In reply to comment #10) > I'm still finding the odd wrinkle :( The latest is strange and I haven't found > a way to fix it. > > If I create a valid Dividend transaction and save it, then decide to edit it > and make it an Add shares instead, when that is saved, the transaction is > flagged as having a missing assignment, of the dividend amount. I haven't > found a way to correct this, other than deleting the transaction and starting > again. > > The reason I was changing a Dividend to an Add was that I have been finding > widget problems when editing an existing transaction. > > Bearing in mind that the circumstances are somewhat artificial, is it > acceptable to resort to deleting the transaction, or is there a better way? Hoping that someone is interested, I'm coming back to this issue. Whilst my example is not very likely, it is not totally unrealistic. It also can affect other types than the 'add shares' I first noticed. When I've been trying to tie up loose ends in the UI, I've tried to show only the necessary widgets. In this case, however, when attempting to change to an 'add shares', or to 'reinvest', not all widgets are shown, so a clean edit is not possible, without a lot of jiggery-pokery. Should the app be able to cope with such an issue, or is zapping the transaction an acceptable solution? 1157604 12 agander93 2011-08-27 19:32:31 +0000 (In reply to comment #3) > (In reply to comment #2) > > One thing you could try is to replace > > > > w->hide(); > > > > with > > > > QTimer::singleShot(0, w, SLOT(hide())); > > > > If that does not work, try if replacing 0 with a value of 1000 makes a > > difference. > Eventually, I settled on a value of '1', which has worked nicely, and I had to use it quite a lot. However, and unexpectedly, I think I found why it appeared necessary, when I had accepted it and wasn't looking any deeper. After a break, when I was doing a tidy up, one of the widgets which I had got to work correctly, appeared again when it should have been hidden. Immediately on opening a new investment transaction, when 'Buy shares' was displayed, but hadn't been selected, the 'Interest' widget was visible, when it shouldn't have been. When 'Buy shares' was selected, the widget correctly was hidden. I found that in InvestTransactionEditor::slotUpdateActivity(), 'haveWidget("interest-account")->parentWidget()->hide()' didn't hide the combobox. When I removed the 'parentWidget()' element, I was able to revert the majority of the cases where I'd needed to use the QTimer. 1157605 13 agander93 2011-08-27 19:34:08 +0000 (In reply to comment #3) > (In reply to comment #2) > > One thing you could try is to replace > > > > w->hide(); > > > > with > > > > QTimer::singleShot(0, w, SLOT(hide())); > > > > If that does not work, try if replacing 0 with a value of 1000 makes a > > difference. > Eventually, I settled on a value of '1', which has worked nicely, and I had to use it quite a lot. However, and unexpectedly, I think I found why it appeared necessary, when I had accepted it and wasn't looking any deeper. After a break, when I was doing a tidy up, one of the widgets which I had got to work correctly, appeared again when it should have been hidden. Immediately on opening a new investment transaction, when 'Buy shares' was displayed, but hadn't been selected, the 'Interest' widget was visible, when it shouldn't have been. When 'Buy shares' was selected, the widget correctly was hidden. I found that in InvestTransactionEditor::slotUpdateActivity(), 'haveWidget("interest-account")->parentWidget()->hide()' didn't hide the combobox. When I removed the 'parentWidget()' element, I was able to revert the majority of the cases where I'd needed to use the QTimer. 1157610 14 agander93 2011-08-27 19:37:33 +0000 Please ignore the duplication, which resulted from a mid-air collision with myself. 1163581 15 agander93 2011-09-17 09:52:44 +0000 SVN commit 1254077 by allananderson: BUG:276322 REVIEW:6791 If an existing cash dividend transaction is selected, the form shows widgets for Date, Amount, Total and Status, which is what is expected. If that transaction is then opened for editing, additional widgets show for Security, Quantity and Price, which aren't expected for a cash dividend. If, while the transaction is open for editing, 'Dividend' is reselected, the additional fields disappear. Similar behaviour occurs for Buy transactions. Also, in numerous places, the likes of - QWidget* w = haveWidget(*it_s); if (w) w->hide(); were found to produce unreliable results. Also, When a Dividend transaction is opened for editing, the fee category field is active, but there is no label. If a fee category is entered, the fee amount field becomes active - again no label, and if an amount is entered, the total reflects this change. However, when the transaction edit is accepted, the fee amount has been lost. Also, fees have been removed from Dividends, and interest income has been removed from Buy and Sell, as these seem most unlikely combinations. I've noticed various other anomalies in the various investment types, to do with unnecessary fields, missing labels and one where it's possible to enter a value for a fee without a category, and which doesn't get retained. M +116 -54 dialogs/investactivities.cpp M +47 -26 dialogs/investtransactioneditor.cpp M +2 -2 widgets/transaction.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=1254077 1401324 16 onet.cristian 2013-10-03 18:05:25 +0000 Git commit a82ddef366860e8cd63ca903f7d8e1192c38d65d by Cristian Oneț, on behalf of Allan Anderson. Committed on 17/09/2011 at 09:52. Pushed by conet into branch '4.6'. REVIEW:6791 If an existing cash dividend transaction is selected, the form shows widgets for Date, Amount, Total and Status, which is what is expected. If that transaction is then opened for editing, additional widgets show for Security, Quantity and Price, which aren't expected for a cash dividend. If, while the transaction is open for editing, 'Dividend' is reselected, the additional fields disappear. Similar behaviour occurs for Buy transactions. Also, in numerous places, the likes of - QWidget* w = haveWidget(*it_s); if (w) w->hide(); were found to produce unreliable results. Also, When a Dividend transaction is opened for editing, the fee category field is active, but there is no label. If a fee category is entered, the fee amount field becomes active - again no label, and if an amount is entered, the total reflects this change. However, when the transaction edit is accepted, the fee amount has been lost. Also, fees have been removed from Dividends, and interest income has been removed from Buy and Sell, as these seem most unlikely combinations. I've noticed various other anomalies in the various investment types, to do with unnecessary fields, missing labels and one where it's possible to enter a value for a fee without a category, and which doesn't get retained. svn path=/trunk/extragear/office/kmymoney/; revision=1254077 (cherry picked from commit 101225c4ec65fc7eb4c94d92ee38a32666013908) M +116 -54 kmymoney/dialogs/investactivities.cpp M +48 -27 kmymoney/dialogs/investtransactioneditor.cpp M +2 -2 kmymoney/widgets/transaction.cpp http://commits.kde.org/kmymoney/a82ddef366860e8cd63ca903f7d8e1192c38d65d 1414789 17 agander93 2013-11-27 22:46:53 +0000 [From the list -On 24/11/13 23:28, William H. Haller wrote:} > Allan, > > I noticed in your comments on this commit that Interest income was > removed from Buys and Sells. Buys I can see, but I have been using the > field in Sells to have a place to record long and short term capital > gains. Thought I'd pass this along as a reasonable use case - it is > useful for tax purposes to be able to record your income on sales > somewhere. I've been patching this back into the total for a sell price. 1415839 18 83878 agander93 2013-12-02 14:13:39 +0000 Created attachment 83878 Patch to reinstate interest field in Sell activities. Will commit patch shortly. 1416465 19 agander93 2013-12-04 18:03:36 +0000 Git commit 3edd6f3b1eb10aa075dc2ebc4c37be74f258722c by Allan Anderson. Committed on 27/11/2013 at 22:41. Pushed by allananderson into branch 'master'. M +12 -5 kmymoney/dialogs/investactivities.cpp M +4 -3 kmymoney/dialogs/investtransactioneditor.cpp http://commits.kde.org/kmymoney/3edd6f3b1eb10aa075dc2ebc4c37be74f258722c 1424395 20 agander93 2014-01-12 21:10:45 +0000 From the Users list - "I was updating my investment 401K accounts for year end to file taxes and noticed that for BUY Shares, only the Fee category line appears now appears in the transaction entry area. Previously, and I am not sure in what version, the Interest Category line was present in the input area as well. This is important because I work for a company that allows me to buy stock each quarter at a discount / subsidy. This is income to me on my W2. The Fee category does not accept an income category in the line item, even when you split the line. All of my previously entered purchases with the discount now have the interest line hidden. I have to switch the transaction type to see the hidden line. Why does this matter? As I stated the discount is income and I believe should appear in the income section of income and cash flow statements. Allocating this to an expense category that is a credit (negative for income) instead of debit does track the dollars, but not correctly. I have to explain it to may accountant every year or do a journal entry to move the balance to the correct account which should not be required. Either way, it is a hassle. Can we get the interest category added back to the investment entry screen? This may be related to BUG:322768 - Interest category and amount disappear when new fee entered in Dividend. Also, fixes for KEditWidget visibility issues. I believe that widget visibility should be at the lowest common denominator. That is if there is any question, show it and let the user choose to enter a value, even if the programmer does not agree. Thank you -- *Joe W. Byers* " My reply - Ok, Joe. I hold my hand up here. In fact, this goes back even further, to https://bugs.kde.org/show_bug.cgi?id=276322m, June 2011. Here's the first paragraph, to give you the initial issue. "The problem shows best if the transaction form is enabled, but also is evident without the form. If an existing cash dividend transaction is selected, the form shows widgets for Date, Amount, Total and Status, which is what is expected. If that transaction is then opened for editing, additional widgets show for Security, Quantity and Price, which aren't expected for a cash dividend. If, while the transaction is open for editing, 'Dividend' is reselected, the additional fields disappear. Similar behaviour occurs for Buy transactions." This prompted a review of what action types needed what fields, partly bearing in mind the new user, and trying to avoid 'visual overload'. More recently, interest was reinstated for Sell transactions, and now we have a use case for Buy transactions, too. I'm happy to respond, but don't think to the extent of enabling everything on everything, though. Allan 1424907 21 84654 agander93 2014-01-15 13:08:47 +0000 Created attachment 84654 Reinstate Interest category for Buy activities. Also, Fix misbehaviour of Interest widget (flickering) in several activity types. Reinstate Interest category for Buy activities. Also, Fix misbehaviour of Interest widget (flickering) in several activity types. 1424908 22 agander93 2014-01-15 13:10:59 +0000 All tests OK now. If no objections, I'll commit in a week or so. 1463697 23 onet.cristian 2014-07-31 09:58:34 +0000 Fix '3edd6f3b1eb10aa075dc2ebc4c37be74f258722c' committed by Allan. 1480312 24 mtibouchi+kdebugtrack 2014-11-09 02:43:24 +0000 (In reply to allan from comment #22) > All tests OK now. > > If no objections, I'll commit in a week or so. Apparently, this patch reinstating the interest field in Buy activities has never been committed; it is still not present in git today. Please do so! The problem is very jarring in the situation mentioned by J.W. Byers above (being allowed to buy company stock at a discount). For now we have to manually patch KMyMoney 4.7.1 to recover our previous workflow. 1480335 25 onet.cristian 2014-11-09 10:40:19 +0000 Git commit 404d6279c74b8e93696f774fd04ac55d29307325 by Cristian Oneț. Committed on 09/11/2014 at 10:27. Pushed by conet into branch 'master'. Fix the missing interest category for 'Buy' activities. This fix is based on Allan's patch which is attached to the bug report that I incorrectly thought to be fixed. I did some refactoring because the readability of the investment activities was horrible. We really should not have that kind of code in the application. M +29 -92 kmymoney/dialogs/investactivities.cpp M +1 -0 kmymoney/dialogs/investactivities.h M +12 -8 kmymoney/dialogs/investtransactioneditor.cpp http://commits.kde.org/kmymoney/404d6279c74b8e93696f774fd04ac55d29307325 1480336 26 onet.cristian 2014-11-09 10:41:09 +0000 Git commit cd6b3c9a653096188097fba254360edda395a14f by Cristian Oneț. Committed on 09/11/2014 at 10:27. Pushed by conet into branch '4.7'. Fix the missing interest category for 'Buy' activities. This fix is based on Allan's patch which is attached to the bug report that I incorrectly thought to be fixed. I did some refactoring because the readability of the investment activities was horrible. We really should not have that kind of code in the application. (cherry picked from commit 404d6279c74b8e93696f774fd04ac55d29307325) M +29 -92 kmymoney/dialogs/investactivities.cpp M +1 -0 kmymoney/dialogs/investactivities.h M +12 -8 kmymoney/dialogs/investtransactioneditor.cpp http://commits.kde.org/kmymoney/cd6b3c9a653096188097fba254360edda395a14f 1480337 27 agander93 2014-11-09 10:48:53 +0000 (In reply to Cristian Oneț from comment #26) > Git commit cd6b3c9a653096188097fba254360edda395a14f by Cristian Oneț. > Committed on 09/11/2014 at 10:27. > Pushed by conet into branch '4.7'. > > Fix the missing interest category for 'Buy' activities. > > This fix is based on Allan's patch which is attached to the bug report > that I incorrectly thought to be fixed. Thanks, Cristian, I had just starting to look into this. Initially, I too, thought that it had been committed, because of your following commit. > I did some refactoring > because the readability of the investment activities was horrible. We > really should not have that kind of code in the application. > (cherry picked from commit 404d6279c74b8e93696f774fd04ac55d29307325) > > M +29 -92 kmymoney/dialogs/investactivities.cpp > M +1 -0 kmymoney/dialogs/investactivities.h > M +12 -8 kmymoney/dialogs/investtransactioneditor.cpp > > http://commits.kde.org/kmymoney/cd6b3c9a653096188097fba254360edda395a14f 83878 2013-12-02 14:13:39 +0000 2013-12-02 14:13:39 +0000 Patch to reinstate interest field in Sell activities. 0001-BUG-276322-Unwanted-fields-show-in-ledger-for-invest.patch text/plain 4722 agander93 RnJvbSBlNmExZmQ2Y2JhYjJjNTU2ODllZTBjY2I4NTU3ZGZlZjVkZDcwMTgxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGxhbiBBbmRlcnNvbiA8YWdhbmRlcjkzQGdtYWlsLmNvbT4K RGF0ZTogV2VkLCAyNyBOb3YgMjAxMyAyMjo0MToxMyArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIEJV RzoyNzYzMjIgLSBVbndhbnRlZCBmaWVsZHMgc2hvdyBpbiBsZWRnZXIgZm9yIGludmVzdG1lbnQg LQogcmVpbnN0YXRlIEludGVyZXN0IGNhdGVnb3J5IGZvciBTZWxsIGFjdGl2aXRpZXMuCgotLS0K IGtteW1vbmV5L2RpYWxvZ3MvaW52ZXN0YWN0aXZpdGllcy5jcHAgICAgICAgIHwgMTcgKysrKysr KysrKysrLS0tLS0KIGtteW1vbmV5L2RpYWxvZ3MvaW52ZXN0dHJhbnNhY3Rpb25lZGl0b3IuY3Bw IHwgIDcgKysrKy0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCA4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2tteW1vbmV5L2RpYWxvZ3MvaW52ZXN0YWN0aXZpdGllcy5j cHAgYi9rbXltb25leS9kaWFsb2dzL2ludmVzdGFjdGl2aXRpZXMuY3BwCmluZGV4IGU0NzYwZTUu Ljg0YzdlN2IgMTAwNjQ0Ci0tLSBhL2tteW1vbmV5L2RpYWxvZ3MvaW52ZXN0YWN0aXZpdGllcy5j cHAKKysrIGIva215bW9uZXkvZGlhbG9ncy9pbnZlc3RhY3Rpdml0aWVzLmNwcApAQCAtMjc5LDYg KzI3OSwxMCBAQCBib29sIEJ1eTo6Y3JlYXRlVHJhbnNhY3Rpb24oTXlNb25leVRyYW5zYWN0aW9u JiB0LCBNeU1vbmV5U3BsaXQmIHMwLCBNeU1vbmV5U3BsaQogdm9pZCBTZWxsOjpzaG93V2lkZ2V0 cyh2b2lkKSBjb25zdAogewogICBLTXlNb25leUNhdGVnb3J5KiBjYXQ7CisgIGNhdCA9IGR5bmFt aWNfY2FzdDxLTXlNb25leUNhdGVnb3J5Kj4oaGF2ZVdpZGdldCgiaW50ZXJlc3QtYWNjb3VudCIp KTsKKyAgY2F0LT5zaG93KCk7CisgIGNhdC0+c3BsaXRCdXR0b24oKS0+c2hvdygpOworCiAgIGNh dCA9IGR5bmFtaWNfY2FzdDxLTXlNb25leUNhdGVnb3J5Kj4oaGF2ZVdpZGdldCgiZmVlLWFjY291 bnQiKSk7CiAgIGNhdC0+c2hvdygpOwogICBjYXQtPnNwbGl0QnV0dG9uKCktPnNob3coKTsKQEAg LTI4NywxNCArMjkxLDE1IEBAIHZvaWQgU2VsbDo6c2hvd1dpZGdldHModm9pZCkgY29uc3QKICAg c2hhcmVFZGl0LT5zZXRQcmVjaXNpb24oTXlNb25leU1vbmV5OjpkZW5vbVRvUHJlYyhtX3BhcmVu dC0+c2VjdXJpdHkoKS5zbWFsbGVzdEFjY291bnRGcmFjdGlvbigpKSk7CiAKICAgUVN0cmluZ0xp c3Qgd2lkZ2V0czsKLSAgd2lkZ2V0cyA8PCAiYXNzZXQtYWNjb3VudCIgPDwgInNoYXJlcyIgPDwg InByaWNlIiA8PCAidG90YWwiOworICB3aWRnZXRzIDw8ICJhc3NldC1hY2NvdW50IiA8PCAiaW50 ZXJlc3QtYW1vdW50IiA8PCAic2hhcmVzIiA8PCAicHJpY2UiIDw8ICJ0b3RhbCI7CiAgIFFTdHJp bmdMaXN0Ojpjb25zdF9pdGVyYXRvciBpdF93OwogICBmb3IgKGl0X3cgPSB3aWRnZXRzLmNvbnN0 QmVnaW4oKTsgaXRfdyAhPSB3aWRnZXRzLmNvbnN0RW5kKCk7ICsraXRfdykgewogICAgIFFXaWRn ZXQqIHcgPSBoYXZlV2lkZ2V0KCppdF93KTsKICAgICBpZiAodykKICAgICAgIHctPnNob3coKTsK ICAgfQotCisgIHNldExhYmVsVGV4dCgiaW50ZXJlc3QtYW1vdW50LWxhYmVsIiwgaTE4bigiSW50 ZXJlc3QiKSk7CisgIHNldExhYmVsVGV4dCgiaW50ZXJlc3QtbGFiZWwiLCBpMThuKCJJbnRlcmVz dCIpKTsKICAgc2V0TGFiZWxUZXh0KCJmZWUtbGFiZWwiLCBpMThuKCJGZWVzIikpOwogICBzZXRM YWJlbFRleHQoImFzc2V0LWxhYmVsIiwgaTE4bigiQWNjb3VudCIpKTsKICAgc2V0TGFiZWxUZXh0 KCJzaGFyZXMtbGFiZWwiLCBpMThuKCJTaGFyZXMiKSk7CkBAIC0zMDcsNiArMzEyLDcgQEAgYm9v bCBTZWxsOjppc0NvbXBsZXRlKFFTdHJpbmcmIHJlYXNvbikgY29uc3QKICAgYm9vbCByYyA9IEFj dGl2aXR5Ojppc0NvbXBsZXRlKHJlYXNvbik7CiAgIHJjICY9IGhhdmVBc3NldEFjY291bnQoKTsK ICAgcmMgJj0gaGF2ZUZlZXModHJ1ZSk7CisgIHJjICY9IGhhdmVJbnRlcmVzdCh0cnVlKTsKICAg cmMgJj0gaGF2ZVNoYXJlcygpOwogICByYyAmPSBoYXZlUHJpY2UoKTsKICAgcmV0dXJuIHJjOwpA QCAtMzU0LDExICszNjAsMTIgQEAgYm9vbCBTZWxsOjpjcmVhdGVUcmFuc2FjdGlvbihNeU1vbmV5 VHJhbnNhY3Rpb24mIHQsIE15TW9uZXlTcGxpdCYgczAsIE15TW9uZXlTcGwKICAgaWYgKCFjcmVh dGVDYXRlZ29yeVNwbGl0cyh0LCBkeW5hbWljX2Nhc3Q8S015TW9uZXlDYXRlZ29yeSo+KGhhdmVX aWRnZXQoImZlZS1hY2NvdW50IikpLCBkeW5hbWljX2Nhc3Q8a015TW9uZXlFZGl0Kj4oaGF2ZVdp ZGdldCgiZmVlLWFtb3VudCIpKSwgTXlNb25leU1vbmV5KDEsIDEpLCBmZWVTcGxpdHMsIG1fZmVl U3BsaXRzKSkKICAgICByZXR1cm4gZmFsc2U7CiAKLSAgY3JlYXRlQXNzZXRBY2NvdW50U3BsaXQo YXNzZXRBY2NvdW50U3BsaXQsIHMwKTsKKyAgaWYgKCFjcmVhdGVDYXRlZ29yeVNwbGl0cyh0LCBk eW5hbWljX2Nhc3Q8S015TW9uZXlDYXRlZ29yeSo+KGhhdmVXaWRnZXQoImludGVyZXN0LWFjY291 bnQiKSksIGR5bmFtaWNfY2FzdDxrTXlNb25leUVkaXQqPihoYXZlV2lkZ2V0KCJpbnRlcmVzdC1h bW91bnQiKSksIE15TW9uZXlNb25leSgtMSwgMSksIGludGVyZXN0U3BsaXRzLCBtX2ludGVyZXN0 U3BsaXRzKSkKKyAgICByZXR1cm4gZmFsc2U7CiAKLSAgaW50ZXJlc3RTcGxpdHMuY2xlYXIoKTsK KyAgY3JlYXRlQXNzZXRBY2NvdW50U3BsaXQoYXNzZXRBY2NvdW50U3BsaXQsIHMwKTsKIAotICBN eU1vbmV5TW9uZXkgdG90YWwgPSBzdW1TcGxpdHMoczAsIGZlZVNwbGl0cywgUUxpc3Q8TXlNb25l eVNwbGl0PigpKTsKKyAgTXlNb25leU1vbmV5IHRvdGFsID0gc3VtU3BsaXRzKHMwLCBmZWVTcGxp dHMsIGludGVyZXN0U3BsaXRzKTsKICAgYXNzZXRBY2NvdW50U3BsaXQuc2V0VmFsdWUoLXRvdGFs KTsKIAogICBpZiAoIW1fcGFyZW50LT5zZXR1cFByaWNlKHQsIGFzc2V0QWNjb3VudFNwbGl0KSkK ZGlmZiAtLWdpdCBhL2tteW1vbmV5L2RpYWxvZ3MvaW52ZXN0dHJhbnNhY3Rpb25lZGl0b3IuY3Bw IGIva215bW9uZXkvZGlhbG9ncy9pbnZlc3R0cmFuc2FjdGlvbmVkaXRvci5jcHAKaW5kZXggODA1 YmQ4ZC4uMDI4M2NmMCAxMDA2NDQKLS0tIGEva215bW9uZXkvZGlhbG9ncy9pbnZlc3R0cmFuc2Fj dGlvbmVkaXRvci5jcHAKKysrIGIva215bW9uZXkvZGlhbG9ncy9pbnZlc3R0cmFuc2FjdGlvbmVk aXRvci5jcHAKQEAgLTUyNiw3ICs1MjYsNyBAQCB2b2lkIEludmVzdFRyYW5zYWN0aW9uRWRpdG9y OjpzbG90VXBkYXRlSW50ZXJlc3RWaXNpYmlsaXR5KGNvbnN0IFFTdHJpbmcmIHR4dCkKICAgUUxh YmVsKiBsID0gZHluYW1pY19jYXN0PFFMYWJlbCo+KGhhdmVXaWRnZXQoImludGVyZXN0LWFtb3Vu dC1sYWJlbCIpKTsKIAogICBLTXlNb25leUNhdGVnb3J5KiBpbnRlcmVzdCA9IGR5bmFtaWNfY2Fz dDxLTXlNb25leUNhdGVnb3J5Kj4oaGF2ZVdpZGdldCgiaW50ZXJlc3QtYWNjb3VudCIpKTsKLSAg Y29uc3QgYm9vbCBzaG93SW50ZXJlc3QgPSAhdHh0LmlzRW1wdHkoKSAmJiAoZC0+bV9hY3Rpdml0 eS0+dHlwZSgpID09IE15TW9uZXlTcGxpdDo6RGl2aWRlbmQgfHwKKyAgY29uc3QgYm9vbCBzaG93 SW50ZXJlc3QgPSAhdHh0LmlzRW1wdHkoKSAmJiAoZC0+bV9hY3Rpdml0eS0+dHlwZSgpID09IE15 TW9uZXlTcGxpdDo6U2VsbFNoYXJlcyB8fCBkLT5tX2FjdGl2aXR5LT50eXBlKCkgPT0gTXlNb25l eVNwbGl0OjpEaXZpZGVuZCB8fAogICAgIGQtPm1fYWN0aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5 U3BsaXQ6OkludGVyZXN0SW5jb21lIHx8IGQtPm1fYWN0aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5 U3BsaXQ6OllpZWxkKTsKICAgaWYgKGludGVyZXN0ICYmIHNob3dJbnRlcmVzdCkgewogICAgIGlu dGVyZXN0LT5zcGxpdEJ1dHRvbigpLT5zaG93KCk7CkBAIC01MzUsMTAgKzUzNSwxMiBAQCB2b2lk IEludmVzdFRyYW5zYWN0aW9uRWRpdG9yOjpzbG90VXBkYXRlSW50ZXJlc3RWaXNpYmlsaXR5KGNv bnN0IFFTdHJpbmcmIHR4dCkKICAgICAgIGwtPnNldFRleHQoaTE4bigiSW50ZXJlc3QiKSk7CiAg IH0gZWxzZSB7CiAgICAgLy8gZm9yIHRoZSBmb2xsb3dpbmcgYWN0aXZpdHktPnR5cGVzIC0KLSAg ICAvLyAgUmVpbnZlc3REaXZpZGVuZCwgQnV5U2hhcmVzLCBTZWxsU2hhcmVzLCBBZGRTaGFyZXMs IFJlbW92ZVNoYXJlcyBhbmQgU3BsaXRTaGFyZXMKKyAgICAvLyAgUmVpbnZlc3REaXZpZGVuZCwg QnV5U2hhcmVzLCBBZGRTaGFyZXMsIFJlbW92ZVNoYXJlcyBhbmQgU3BsaXRTaGFyZXMKICAgICBp ZiAoaW50ZXJlc3QpIHsKICAgICAgIGludGVyZXN0LT5zcGxpdEJ1dHRvbigpLT5oaWRlKCk7ICAv L25vIGludGVyZXN0LWFtb3VudCBzbyBubyBzcGxpdHMKICAgICAgIHctPmhpZGUoKTsKKyAgICAg IGlmIChsKQorICAgICAgICBsLT5zZXRUZXh0KFFTdHJpbmcoKSk7CiAgICAgfQogICB9CiB9CkBA IC01NTAsNyArNTUyLDYgQEAgdm9pZCBJbnZlc3RUcmFuc2FjdGlvbkVkaXRvcjo6c2xvdENyZWF0 ZUludGVyZXN0Q2F0ZWdvcnkoY29uc3QgUVN0cmluZyYgbmFtZSwgUVMKIAogICBlbWl0IGNyZWF0 ZUNhdGVnb3J5KGFjYywgTXlNb25leUZpbGU6Omluc3RhbmNlKCktPmluY29tZSgpKTsKIAotICAv LyByZXR1cm4gaWQKICAgaWQgPSBhY2MuaWQoKTsKIH0KIAotLSAKMS44LjEuMgoK 84654 2014-01-15 13:08:47 +0000 2014-01-15 13:08:47 +0000 Reinstate Interest category for Buy activities. Also, Fix misbehaviour of Interest widget (flickering) in several activity types. 0001-BUG-276322-Reinstate-Interest-category-for-Buy-activ.patch text/plain 5494 agander93 RnJvbSBiZTE0NmFkOGRmNzc2MmYxNzBhYmNiNzJlYTk5MzFlMWM2ZGY2NzZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGxhbiBBbmRlcnNvbiA8YWdhbmRlcjkzQGdtYWlsLmNvbT4K RGF0ZTogV2VkLCAxNSBKYW4gMjAxNCAxMjo1OToyMiArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIEJV RzoyNzYzMjIgLSBSZWluc3RhdGUgSW50ZXJlc3QgY2F0ZWdvcnkgZm9yIEJ1eSBhY3Rpdml0aWVz LgogQWxzbywgRml4IG1pc2JlaGF2aW91ciBvZiBJbnRlcmVzdCB3aWRnZXQgKGZsaWNrZXJpbmcp IGluIHNldmVyYWwgYWN0aXZpdHkKIHR5cGVzLgoKLS0tCiBrbXltb25leS9kaWFsb2dzL2ludmVz dGFjdGl2aXRpZXMuY3BwICAgICAgICB8IDEzICsrKysrLS0tLS0tLS0KIGtteW1vbmV5L2RpYWxv Z3MvaW52ZXN0dHJhbnNhY3Rpb25lZGl0b3IuY3BwIHwgMTAgKysrKysrKy0tLQogMiBmaWxlcyBj aGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9r bXltb25leS9kaWFsb2dzL2ludmVzdGFjdGl2aXRpZXMuY3BwIGIva215bW9uZXkvZGlhbG9ncy9p bnZlc3RhY3Rpdml0aWVzLmNwcAppbmRleCAxNzIxNzU0Li4xMmRiY2EzIDEwMDY0NAotLS0gYS9r bXltb25leS9kaWFsb2dzL2ludmVzdGFjdGl2aXRpZXMuY3BwCisrKyBiL2tteW1vbmV5L2RpYWxv Z3MvaW52ZXN0YWN0aXZpdGllcy5jcHAKQEAgLTE4OSw5ICsxODksMTEgQEAgdm9pZCBBY3Rpdml0 eTo6cHJlbG9hZEFzc2V0QWNjb3VudCh2b2lkKQogdm9pZCBCdXk6OnNob3dXaWRnZXRzKHZvaWQp IGNvbnN0CiB7CiAgIEtNeU1vbmV5Q2F0ZWdvcnkqIGNhdDsKKyAgY2F0ID0gZHluYW1pY19jYXN0 PEtNeU1vbmV5Q2F0ZWdvcnkqPihoYXZlV2lkZ2V0KCJpbnRlcmVzdC1hY2NvdW50IikpOworICBj YXQtPnNob3coKTsKKwogICBjYXQgPSBkeW5hbWljX2Nhc3Q8S015TW9uZXlDYXRlZ29yeSo+KGhh dmVXaWRnZXQoImZlZS1hY2NvdW50IikpOwogICBjYXQtPnNob3coKTsKLSAgY2F0LT5zcGxpdEJ1 dHRvbigpLT5zaG93KCk7CiAKICAgUVN0cmluZ0xpc3Qgd2lkZ2V0czsKICAgd2lkZ2V0cyA8PCAi YXNzZXQtYWNjb3VudCIgPDwgInNoYXJlcyIgPDwgInByaWNlIiA8PCAidG90YWwiOwpAQCAtMjAy LDYgKzIwNCw4IEBAIHZvaWQgQnV5OjpzaG93V2lkZ2V0cyh2b2lkKSBjb25zdAogICAgICAgdy0+ c2hvdygpOwogICB9CiAKKyAgc2V0TGFiZWxUZXh0KCJpbnRlcmVzdC1hbW91bnQtbGFiZWwiLCBp MThuKCJJbnRlcmVzdCIpKTsKKyAgc2V0TGFiZWxUZXh0KCJpbnRlcmVzdC1sYWJlbCIsIGkxOG4o IkludGVyZXN0IikpOwogICBzZXRMYWJlbFRleHQoImZlZS1sYWJlbCIsIGkxOG4oIkZlZXMiKSk7 CiAgIHNldExhYmVsVGV4dCgiYXNzZXQtbGFiZWwiLCBpMThuKCJBY2NvdW50IikpOwogICBzZXRM YWJlbFRleHQoInNoYXJlcy1sYWJlbCIsIGkxOG4oIlNoYXJlcyIpKTsKQEAgLTI4MSwxMSArMjg1 LDkgQEAgdm9pZCBTZWxsOjpzaG93V2lkZ2V0cyh2b2lkKSBjb25zdAogICBLTXlNb25leUNhdGVn b3J5KiBjYXQ7CiAgIGNhdCA9IGR5bmFtaWNfY2FzdDxLTXlNb25leUNhdGVnb3J5Kj4oaGF2ZVdp ZGdldCgiaW50ZXJlc3QtYWNjb3VudCIpKTsKICAgY2F0LT5zaG93KCk7Ci0gIGNhdC0+c3BsaXRC dXR0b24oKS0+c2hvdygpOwogCiAgIGNhdCA9IGR5bmFtaWNfY2FzdDxLTXlNb25leUNhdGVnb3J5 Kj4oaGF2ZVdpZGdldCgiZmVlLWFjY291bnQiKSk7CiAgIGNhdC0+c2hvdygpOwotICBjYXQtPnNw bGl0QnV0dG9uKCktPnNob3coKTsKIAogICBrTXlNb25leUVkaXQqIHNoYXJlRWRpdCA9IGR5bmFt aWNfY2FzdDxrTXlNb25leUVkaXQqPihoYXZlV2lkZ2V0KCJzaGFyZXMiKSk7CiAgIHNoYXJlRWRp dC0+c2V0UHJlY2lzaW9uKE15TW9uZXlNb25leTo6ZGVub21Ub1ByZWMobV9wYXJlbnQtPnNlY3Vy aXR5KCkuc21hbGxlc3RBY2NvdW50RnJhY3Rpb24oKSkpOwpAQCAtMzgwLDExICszODIsOSBAQCB2 b2lkIERpdjo6c2hvd1dpZGdldHModm9pZCkgY29uc3QKIAogICBjYXQgPSBkeW5hbWljX2Nhc3Q8 S015TW9uZXlDYXRlZ29yeSo+KGhhdmVXaWRnZXQoImludGVyZXN0LWFjY291bnQiKSk7CiAgIGNh dC0+c2hvdygpOwotICBjYXQtPnNwbGl0QnV0dG9uKCktPnNob3coKTsKIAogICBjYXQgPSBkeW5h bWljX2Nhc3Q8S015TW9uZXlDYXRlZ29yeSo+KGhhdmVXaWRnZXQoImZlZS1hY2NvdW50IikpOwog ICBjYXQtPnNob3coKTsKLSAgY2F0LT5zcGxpdEJ1dHRvbigpLT5zaG93KCk7CiAKICAgUVN0cmlu Z0xpc3Qgd2lkZ2V0czsKICAgd2lkZ2V0cyA8PCAiYXNzZXQtYWNjb3VudCIgPDwgImludGVyZXN0 LWFtb3VudCIgPDwgInRvdGFsIjsKQEAgLTQ2MSw3ICs0NjEsNiBAQCB2b2lkIFJlaW52ZXN0Ojpz aG93V2lkZ2V0cyh2b2lkKSBjb25zdAogCiAgIGNhdCA9IGR5bmFtaWNfY2FzdDxLTXlNb25leUNh dGVnb3J5Kj4oaGF2ZVdpZGdldCgiZmVlLWFjY291bnQiKSk7CiAgIGNhdC0+c2hvdygpOwotICBj YXQtPnNwbGl0QnV0dG9uKCktPnNob3coKTsKIAogICBrTXlNb25leUVkaXQqIHNoYXJlRWRpdCA9 IGR5bmFtaWNfY2FzdDxrTXlNb25leUVkaXQqPihoYXZlV2lkZ2V0KCJzaGFyZXMiKSk7CiAgIHNo YXJlRWRpdC0+c2hvdygpOwpAQCAtNjkyLDExICs2OTEsOSBAQCB2b2lkIEludEluYzo6c2hvd1dp ZGdldHModm9pZCkgY29uc3QKIAogICBjYXQgPSBkeW5hbWljX2Nhc3Q8S015TW9uZXlDYXRlZ29y eSo+KGhhdmVXaWRnZXQoImludGVyZXN0LWFjY291bnQiKSk7CiAgIGNhdC0+c2hvdygpOwotICBj YXQtPnNwbGl0QnV0dG9uKCktPnNob3coKTsKIAogICBjYXQgPSBkeW5hbWljX2Nhc3Q8S015TW9u ZXlDYXRlZ29yeSo+KGhhdmVXaWRnZXQoImZlZS1hY2NvdW50IikpOwogICBjYXQtPnNob3coKTsK LSAgY2F0LT5zcGxpdEJ1dHRvbigpLT5zaG93KCk7CiAKICAgUVN0cmluZ0xpc3Qgd2lkZ2V0czsK ICAgd2lkZ2V0cyA8PCAiYXNzZXQtYWNjb3VudCIgPDwgImludGVyZXN0LWFtb3VudCIgPDwgInRv dGFsIjsKZGlmZiAtLWdpdCBhL2tteW1vbmV5L2RpYWxvZ3MvaW52ZXN0dHJhbnNhY3Rpb25lZGl0 b3IuY3BwIGIva215bW9uZXkvZGlhbG9ncy9pbnZlc3R0cmFuc2FjdGlvbmVkaXRvci5jcHAKaW5k ZXggNWRjMTUwMC4uYWY1ODU3MiAxMDA2NDQKLS0tIGEva215bW9uZXkvZGlhbG9ncy9pbnZlc3R0 cmFuc2FjdGlvbmVkaXRvci5jcHAKKysrIGIva215bW9uZXkvZGlhbG9ncy9pbnZlc3R0cmFuc2Fj dGlvbmVkaXRvci5jcHAKQEAgLTUwMiw2ICs1MDIsNyBAQCB2b2lkIEludmVzdFRyYW5zYWN0aW9u RWRpdG9yOjpzbG90VXBkYXRlRmVlVmlzaWJpbGl0eShjb25zdCBRU3RyaW5nJiB0eHQpCiAgIGZl ZUFtb3VudC0+c2V0SGlkZGVuKHR4dC5pc0VtcHR5KCkpOwogICBRTGFiZWwqIGwgPSBkeW5hbWlj X2Nhc3Q8UUxhYmVsKj4oaGF2ZVdpZGdldCgiZmVlLWFtb3VudC1sYWJlbCIpKTsKIAorICBLTXlN b25leUNhdGVnb3J5KiBmZWUgPSBkeW5hbWljX2Nhc3Q8S015TW9uZXlDYXRlZ29yeSo+KGhhdmVX aWRnZXQoImZlZS1hY2NvdW50IikpOwogICBjb25zdCBib29sIGhpZGVGZWUgPSB0eHQuaXNFbXB0 eSgpIHx8IGQtPm1fYWN0aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5U3BsaXQ6OkFkZFNoYXJlcyB8 fAogICAgIGQtPm1fYWN0aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5U3BsaXQ6OlJlbW92ZVNoYXJl cyB8fAogICAgIGQtPm1fYWN0aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5U3BsaXQ6OlNwbGl0U2hh cmVzOwpAQCAtNTExLDExICs1MTIsMTMgQEAgdm9pZCBJbnZlc3RUcmFuc2FjdGlvbkVkaXRvcjo6 c2xvdFVwZGF0ZUZlZVZpc2liaWxpdHkoY29uc3QgUVN0cmluZyYgdHh0KQogICAgICAgbC0+c2V0 VGV4dCgiIik7CiAgICAgfQogICAgIGZlZUFtb3VudC0+aGlkZSgpOworICAgIGZlZS0+c3BsaXRC dXR0b24oKS0+aGlkZSgpOwogICB9IGVsc2UgewogICAgIGlmIChsKSB7CiAgICAgICBsLT5zZXRU ZXh0KGkxOG4oIkZlZSBBbW91bnQiKSk7CiAgICAgfQogICAgIGZlZUFtb3VudC0+c2hvdygpOwor ICAgIGZlZS0+c3BsaXRCdXR0b24oKS0+c2hvdygpOwogICB9CiB9CiAKQEAgLTUzMSw4ICs1MzQs OSBAQCB2b2lkIEludmVzdFRyYW5zYWN0aW9uRWRpdG9yOjpzbG90VXBkYXRlSW50ZXJlc3RWaXNp YmlsaXR5KGNvbnN0IFFTdHJpbmcmIHR4dCkKICAgUUxhYmVsKiBsID0gZHluYW1pY19jYXN0PFFM YWJlbCo+KGhhdmVXaWRnZXQoImludGVyZXN0LWFtb3VudC1sYWJlbCIpKTsKIAogICBLTXlNb25l eUNhdGVnb3J5KiBpbnRlcmVzdCA9IGR5bmFtaWNfY2FzdDxLTXlNb25leUNhdGVnb3J5Kj4oaGF2 ZVdpZGdldCgiaW50ZXJlc3QtYWNjb3VudCIpKTsKLSAgY29uc3QgYm9vbCBzaG93SW50ZXJlc3Qg PSAhdHh0LmlzRW1wdHkoKSAmJiAoZC0+bV9hY3Rpdml0eS0+dHlwZSgpID09IE15TW9uZXlTcGxp dDo6U2VsbFNoYXJlcyB8fCBkLT5tX2FjdGl2aXR5LT50eXBlKCkgPT0gTXlNb25leVNwbGl0OjpE aXZpZGVuZCB8fAotICAgIGQtPm1fYWN0aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5U3BsaXQ6Oklu dGVyZXN0SW5jb21lIHx8IGQtPm1fYWN0aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5U3BsaXQ6Ollp ZWxkKTsKKyAgY29uc3QgYm9vbCBzaG93SW50ZXJlc3QgPSAhdHh0LmlzRW1wdHkoKSAmJiAoZC0+ bV9hY3Rpdml0eS0+dHlwZSgpID09IE15TW9uZXlTcGxpdDo6QnV5U2hhcmVzIHx8IGQtPm1fYWN0 aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5U3BsaXQ6OlNlbGxTaGFyZXMgfHwKKyAgICBkLT5tX2Fj dGl2aXR5LT50eXBlKCkgPT0gTXlNb25leVNwbGl0OjpEaXZpZGVuZCB8fCBkLT5tX2FjdGl2aXR5 LT50eXBlKCkgPT0gTXlNb25leVNwbGl0OjpJbnRlcmVzdEluY29tZSB8fAorICAgIGQtPm1fYWN0 aXZpdHktPnR5cGUoKSA9PSBNeU1vbmV5U3BsaXQ6OllpZWxkKTsKICAgaWYgKGludGVyZXN0ICYm IHNob3dJbnRlcmVzdCkgewogICAgIGludGVyZXN0LT5zcGxpdEJ1dHRvbigpLT5zaG93KCk7CiAg ICAgdy0+c2hvdygpOwpAQCAtNTQwLDcgKzU0NCw3IEBAIHZvaWQgSW52ZXN0VHJhbnNhY3Rpb25F ZGl0b3I6OnNsb3RVcGRhdGVJbnRlcmVzdFZpc2liaWxpdHkoY29uc3QgUVN0cmluZyYgdHh0KQog ICAgICAgbC0+c2V0VGV4dChpMThuKCJJbnRlcmVzdCIpKTsKICAgfSBlbHNlIHsKICAgICAvLyBm b3IgdGhlIGZvbGxvd2luZyBhY3Rpdml0eS0+dHlwZXMgLQotICAgIC8vICBSZWludmVzdERpdmlk ZW5kLCBCdXlTaGFyZXMsIEFkZFNoYXJlcywgUmVtb3ZlU2hhcmVzIGFuZCBTcGxpdFNoYXJlcwor ICAgIC8vICBSZWludmVzdERpdmlkZW5kLCBBZGRTaGFyZXMsIFJlbW92ZVNoYXJlcyBhbmQgU3Bs aXRTaGFyZXMKICAgICBpZiAoaW50ZXJlc3QpIHsKICAgICAgIGludGVyZXN0LT5zcGxpdEJ1dHRv bigpLT5oaWRlKCk7ICAvL25vIGludGVyZXN0LWFtb3VudCBzbyBubyBzcGxpdHMKICAgICAgIHct PmhpZGUoKTsKLS0gCjEuOC4xLjIKCg==