515839 2026-02-10 22:14:30 +0000 Cockpit and Dual screen window layouts not compatible with Krita 6 2026-03-17 10:31:13 +0000 1 1 2 Applications krita Usability 6.0.0-beta1 Ubuntu Linux RESOLVED FIXED regression, release_blocker NOR crash --- 1 vurentjie krita-bugs-null dimula73 griffinvalley penguinflyer2222 vurentjie 0 oldest_to_newest 2493359 0 vurentjie 2026-02-10 22:14:30 +0000 SUMMARY The Cockpit and Dual screen window layouts are not compatible with Krita 6. I don't actually use these but I happened to try them today and noticed the issue. STEPS TO REPRODUCE 1. Open Krita 6 2. Open or create a new document 3. From the workspace switcher, select either one of the window layouts: "Cockpit (laptop mode)" or "Dual screen editing" OBSERVED RESULT Krita crashes with a seg fault. I think this might be an issue with the .kwl files compatibility. EXPECTED RESULT Doesn't crash. SOFTWARE/OS VERSIONS Version: 6.0.0-beta1 (git db05298) Hidpi: true Qt: 6.8.0 OS Information Build ABI: x86_64-little_endian-lp64 Build CPU: x86_64 CPU: x86_64 Kernel Type: linux Kernel Version: 6.14.0-37-generic Pretty Productname: Ubuntu 24.04.3 LTS Product Type: ubuntu Product Version: 24.04 Desktop: ubuntu:GNOME Appimage build: Yes ADDITIONAL INFORMATION 2493660 1 penguinflyer2222 2026-02-11 15:58:24 +0000 Confirmed, selecting a window layout crashes on Qt6 but not Qt5. It crashes here > 0 libkritaresourcewidgets.21.0.0.dylib 0x103dbc2e0 KisResourceItemChooser::activate(QModelIndex const&) + 336 (KisResourceItemChooser.cpp:515) When the window layout is activated, the updates are blocked on the window layout chooser, it emits the resourceSelected signal, a bunch of other stuff happens, and then eventually it unblocks the updates. However, by the time it gets back to `d->updatesBlocked = false;`, `d` is null for some reason, so it crashes instead. 2494416 2 189530 vurentjie 2026-02-13 15:07:23 +0000 Created attachment 189530 Fix closing windows cause crash I decided to look into this a bit today. Attached a patch with a fix, It is mainly this line in KisWindowLayoutResource.cpp that cause the crash, when closing the windows: https://invent.kde.org/graphics/krita/-/blame/cb158acfc714301289a63bff7aa892eb8c4f1f23/libs/ui/KisWindowLayoutResource.cpp#L157 I shuffled some things around in openNecessaryWindows(), closeUnneededWindows(). And moved closeUnneededWindows() to the end. This seems to fix the crash. I can submit a PR if you want, or you can take my patch and investigate further. 2494437 3 189530 vurentjie 2026-02-13 16:09:59 +0000 Comment on attachment 189530 Fix closing windows cause crash diff --git a/libs/ui/KisWindowLayoutResource.cpp b/libs/ui/KisWindowLayoutResource.cpp index 2fcec19221..65ff208bf7 100644 --- a/libs/ui/KisWindowLayoutResource.cpp +++ b/libs/ui/KisWindowLayoutResource.cpp @@ -126,10 +126,8 @@ struct KisWindowLayoutResource::Private mainWindow->show(); } } - } - - void closeUnneededWindows(QList<QPointer<KisMainWindow>> &currentWindows) { - QVector<QPointer<KisMainWindow>> windowsToClose; + + QVector<QPointer<KisMainWindow>> windowsToMigrate; Q_FOREACH(KisMainWindow *mainWindow, currentWindows) { bool keep = false; @@ -141,8 +139,8 @@ struct KisWindowLayoutResource::Private } if (!keep) { - windowsToClose.append(mainWindow); - + windowsToMigrate.append(mainWindow); + // Set the window hidden to prevent "show image in all windows" feature from opening new views on it // while we migrate views onto the remaining windows if (mainWindow->isVisible()) { @@ -150,11 +148,25 @@ struct KisWindowLayoutResource::Private } } } + + migrateViewsFromClosingWindows(windowsToMigrate); + } - migrateViewsFromClosingWindows(windowsToClose); + void closeUnneededWindows(QList<QPointer<KisMainWindow>> &currentWindows) { + QVector<QPointer<KisMainWindow>> windowsToClose; + + Q_FOREACH(KisMainWindow *mainWindow, currentWindows) { + bool keep = false; + Q_FOREACH(const Window &window, windows) { + if (window.windowId == mainWindow->id()) { + keep = true; + break; + } + } - Q_FOREACH(QPointer<KisMainWindow> mainWindow, windowsToClose) { - mainWindow->close(); + if (!keep) { + mainWindow->close(); + } } } @@ -248,8 +260,9 @@ void KisWindowLayoutResource::applyLayout() layoutManager->setLastUsedLayout(this); QList<QPointer<KisMainWindow>> currentWindows = kisPart->mainWindows(); + bool createWindows = d->windows.isEmpty(); - if (d->windows.isEmpty()) { + if (createWindows) { // No windows defined (e.g. fresh new session). Leave things as they are, but make sure there's at least one visible main window if (kisPart->mainwindowCount() == 0) { kisPart->createMainWindow(); @@ -258,7 +271,6 @@ void KisWindowLayoutResource::applyLayout() } } else { d->openNecessaryWindows(currentWindows); - d->closeUnneededWindows(currentWindows); } // Wait for the windows to finish opening / closing before applying saved geometry. @@ -300,6 +312,9 @@ void KisWindowLayoutResource::applyLayout() layoutManager->setShowImageInAllWindowsEnabled(d->showImageInAllWindows); layoutManager->setPrimaryWorkspaceFollowsFocus(d->primaryWorkspaceFollowsFocus, d->primaryWindow); + if (!createWindows) { + d->closeUnneededWindows(currentWindows); + } } bool KisWindowLayoutResource::saveToDevice(QIODevice *dev) const 2494438 4 vurentjie 2026-02-13 16:12:15 +0000 Sorry, I am not used to this bug trackers function. I updated the patch, there was one typo, I uncommented a commented line for some reason. 2494443 5 189534 vurentjie 2026-02-13 16:33:50 +0000 Created attachment 189534 Fix closing windows cause crash (fixed typo) Re-uploading patch. 2502810 6 griffinvalley 2026-03-12 14:58:06 +0000 Hey vurentjie, we use gitlab. dmitryK has moved your patch onto gitlab, but hasn't yet mentioned that here, so I am going so now: https://invent.kde.org/graphics/krita/-/merge_requests/2698 2502818 7 vurentjie 2026-03-12 15:20:29 +0000 (In reply to wolthera from comment #6) > Hey vurentjie, we use gitlab. dmitryK has moved your patch onto gitlab, but > hasn't yet mentioned that here, so I am going so now: > https://invent.kde.org/graphics/krita/-/merge_requests/2698 Thanks, the link you share is different, I looked now, and it is this merge request: https://invent.kde.org/graphics/krita/-/merge_requests/2695 2502828 8 griffinvalley 2026-03-12 15:46:37 +0000 Ah, sorry, I had too many tabs open. Good to see you found it though, 2503622 9 dimula73 2026-03-16 12:14:36 +0000 The related MR: https://invent.kde.org/graphics/krita/-/merge_requests/2695 2503948 10 dimula73 2026-03-17 10:31:13 +0000 Hi, vurentjie! The bug is now fixed in both, master and krita/6.0! Thank you for the report and the proposed fix! :) https://invent.kde.org/graphics/krita/-/commit/5cf31d1445ef45373ffe9e5d08a74d8914085fcc 189530 2026-02-13 15:07:23 +0000 2026-02-13 15:07:23 +0000 Fix closing windows cause crash fix-515839.patch text/plain 3275 vurentjie ZGlmZiAtLWdpdCBhL2xpYnMvdWkvS2lzV2luZG93TGF5b3V0UmVzb3VyY2UuY3BwIGIvbGlicy91 aS9LaXNXaW5kb3dMYXlvdXRSZXNvdXJjZS5jcHAKaW5kZXggMmZjZWMxOTIyMS4uYzg5Y2MzZDU1 YSAxMDA2NDQKLS0tIGEvbGlicy91aS9LaXNXaW5kb3dMYXlvdXRSZXNvdXJjZS5jcHAKKysrIGIv bGlicy91aS9LaXNXaW5kb3dMYXlvdXRSZXNvdXJjZS5jcHAKQEAgLTEyNiwxMCArMTI2LDggQEAg c3RydWN0IEtpc1dpbmRvd0xheW91dFJlc291cmNlOjpQcml2YXRlCiAgICAgICAgICAgICAgICAg bWFpbldpbmRvdy0+c2hvdygpOwogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgfQotCi0g ICAgdm9pZCBjbG9zZVVubmVlZGVkV2luZG93cyhRTGlzdDxRUG9pbnRlcjxLaXNNYWluV2luZG93 Pj4gJmN1cnJlbnRXaW5kb3dzKSB7Ci0gICAgICAgIFFWZWN0b3I8UVBvaW50ZXI8S2lzTWFpbldp bmRvdz4+IHdpbmRvd3NUb0Nsb3NlOworICAgICAgICAKKyAgICAgICAgUVZlY3RvcjxRUG9pbnRl cjxLaXNNYWluV2luZG93Pj4gd2luZG93c1RvTWlncmF0ZTsKIAogICAgICAgICBRX0ZPUkVBQ0go S2lzTWFpbldpbmRvdyAqbWFpbldpbmRvdywgY3VycmVudFdpbmRvd3MpIHsKICAgICAgICAgICAg IGJvb2wga2VlcCA9IGZhbHNlOwpAQCAtMTQxLDIwICsxMzksMzQgQEAgc3RydWN0IEtpc1dpbmRv d0xheW91dFJlc291cmNlOjpQcml2YXRlCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlm ICgha2VlcCkgewotICAgICAgICAgICAgICAgIHdpbmRvd3NUb0Nsb3NlLmFwcGVuZChtYWluV2lu ZG93KTsKLQorICAgICAgICAgICAgICAgIHdpbmRvd3NUb01pZ3JhdGUuYXBwZW5kKG1haW5XaW5k b3cpOworICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgIC8vIFNldCB0aGUgd2luZG93 IGhpZGRlbiB0byBwcmV2ZW50ICJzaG93IGltYWdlIGluIGFsbCB3aW5kb3dzIiBmZWF0dXJlIGZy b20gb3BlbmluZyBuZXcgdmlld3Mgb24gaXQKLSAgICAgICAgICAgICAgICAvLyB3aGlsZSB3ZSBt aWdyYXRlIHZpZXdzIG9udG8gdGhlIHJlbWFpbmluZyB3aW5kb3dzCisgICAgICAgICAgICAgICAg d2hpbGUgd2UgbWlncmF0ZSB2aWV3cyBvbnRvIHRoZSByZW1haW5pbmcgd2luZG93cwogICAgICAg ICAgICAgICAgIGlmIChtYWluV2luZG93LT5pc1Zpc2libGUoKSkgewogICAgICAgICAgICAgICAg ICAgICBtYWluV2luZG93LT5oaWRlKCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQogICAgICAgICB9CisgICAgICAgIAorICAgICAgICBtaWdyYXRlVmlld3NGcm9tQ2xvc2luZ1dp bmRvd3Mod2luZG93c1RvTWlncmF0ZSk7CisgICAgfQogCi0gICAgICAgIG1pZ3JhdGVWaWV3c0Zy b21DbG9zaW5nV2luZG93cyh3aW5kb3dzVG9DbG9zZSk7CisgICAgdm9pZCBjbG9zZVVubmVlZGVk V2luZG93cyhRTGlzdDxRUG9pbnRlcjxLaXNNYWluV2luZG93Pj4gJmN1cnJlbnRXaW5kb3dzKSB7 CisgICAgICAgIFFWZWN0b3I8UVBvaW50ZXI8S2lzTWFpbldpbmRvdz4+IHdpbmRvd3NUb0Nsb3Nl OworCisgICAgICAgIFFfRk9SRUFDSChLaXNNYWluV2luZG93ICptYWluV2luZG93LCBjdXJyZW50 V2luZG93cykgeworICAgICAgICAgICAgYm9vbCBrZWVwID0gZmFsc2U7CisgICAgICAgICAgICBR X0ZPUkVBQ0goY29uc3QgV2luZG93ICZ3aW5kb3csIHdpbmRvd3MpIHsKKyAgICAgICAgICAgICAg ICBpZiAod2luZG93LndpbmRvd0lkID09IG1haW5XaW5kb3ctPmlkKCkpIHsKKyAgICAgICAgICAg ICAgICAgICAga2VlcCA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KIAotICAgICAgICBRX0ZPUkVBQ0goUVBvaW50ZXI8 S2lzTWFpbldpbmRvdz4gbWFpbldpbmRvdywgd2luZG93c1RvQ2xvc2UpIHsKLSAgICAgICAgICAg IG1haW5XaW5kb3ctPmNsb3NlKCk7CisgICAgICAgICAgICBpZiAoIWtlZXApIHsKKyAgICAgICAg ICAgICAgICBtYWluV2luZG93LT5jbG9zZSgpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAg ICAgfQogCkBAIC0yNDgsOCArMjYwLDkgQEAgdm9pZCBLaXNXaW5kb3dMYXlvdXRSZXNvdXJjZTo6 YXBwbHlMYXlvdXQoKQogICAgIGxheW91dE1hbmFnZXItPnNldExhc3RVc2VkTGF5b3V0KHRoaXMp OwogCiAgICAgUUxpc3Q8UVBvaW50ZXI8S2lzTWFpbldpbmRvdz4+IGN1cnJlbnRXaW5kb3dzID0g a2lzUGFydC0+bWFpbldpbmRvd3MoKTsKKyAgICBib29sIGNyZWF0ZVdpbmRvd3MgPSBkLT53aW5k b3dzLmlzRW1wdHkoKTsKIAotICAgIGlmIChkLT53aW5kb3dzLmlzRW1wdHkoKSkgeworICAgIGlm IChjcmVhdGVXaW5kb3dzKSB7CiAgICAgICAgIC8vIE5vIHdpbmRvd3MgZGVmaW5lZCAoZS5nLiBm cmVzaCBuZXcgc2Vzc2lvbikuIExlYXZlIHRoaW5ncyBhcyB0aGV5IGFyZSwgYnV0IG1ha2Ugc3Vy ZSB0aGVyZSdzIGF0IGxlYXN0IG9uZSB2aXNpYmxlIG1haW4gd2luZG93CiAgICAgICAgIGlmIChr aXNQYXJ0LT5tYWlud2luZG93Q291bnQoKSA9PSAwKSB7CiAgICAgICAgICAgICBraXNQYXJ0LT5j cmVhdGVNYWluV2luZG93KCk7CkBAIC0yNTgsNyArMjcxLDYgQEAgdm9pZCBLaXNXaW5kb3dMYXlv dXRSZXNvdXJjZTo6YXBwbHlMYXlvdXQoKQogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAg ICAgZC0+b3Blbk5lY2Vzc2FyeVdpbmRvd3MoY3VycmVudFdpbmRvd3MpOwotICAgICAgICBkLT5j bG9zZVVubmVlZGVkV2luZG93cyhjdXJyZW50V2luZG93cyk7CiAgICAgfQogCiAgICAgLy8gV2Fp dCBmb3IgdGhlIHdpbmRvd3MgdG8gZmluaXNoIG9wZW5pbmcgLyBjbG9zaW5nIGJlZm9yZSBhcHBs eWluZyBzYXZlZCBnZW9tZXRyeS4KQEAgLTMwMCw2ICszMTIsOSBAQCB2b2lkIEtpc1dpbmRvd0xh eW91dFJlc291cmNlOjphcHBseUxheW91dCgpCiAKICAgICBsYXlvdXRNYW5hZ2VyLT5zZXRTaG93 SW1hZ2VJbkFsbFdpbmRvd3NFbmFibGVkKGQtPnNob3dJbWFnZUluQWxsV2luZG93cyk7CiAgICAg bGF5b3V0TWFuYWdlci0+c2V0UHJpbWFyeVdvcmtzcGFjZUZvbGxvd3NGb2N1cyhkLT5wcmltYXJ5 V29ya3NwYWNlRm9sbG93c0ZvY3VzLCBkLT5wcmltYXJ5V2luZG93KTsKKyAgICBpZiAoIWNyZWF0 ZVdpbmRvd3MpIHsKKyAgICAgICAgZC0+Y2xvc2VVbm5lZWRlZFdpbmRvd3MoY3VycmVudFdpbmRv d3MpOworICAgIH0KIH0KIAogYm9vbCBLaXNXaW5kb3dMYXlvdXRSZXNvdXJjZTo6c2F2ZVRvRGV2 aWNlKFFJT0RldmljZSAqZGV2KSBjb25zdAo= 189534 2026-02-13 16:33:50 +0000 2026-02-13 16:33:50 +0000 Fix closing windows cause crash (fixed typo) fix-515839.patch text/plain 3227 vurentjie ZGlmZiAtLWdpdCBhL2xpYnMvdWkvS2lzV2luZG93TGF5b3V0UmVzb3VyY2UuY3BwIGIvbGlicy91 aS9LaXNXaW5kb3dMYXlvdXRSZXNvdXJjZS5jcHAKaW5kZXggMmZjZWMxOTIyMS4uNjVmZjIwOGJm NyAxMDA2NDQKLS0tIGEvbGlicy91aS9LaXNXaW5kb3dMYXlvdXRSZXNvdXJjZS5jcHAKKysrIGIv bGlicy91aS9LaXNXaW5kb3dMYXlvdXRSZXNvdXJjZS5jcHAKQEAgLTEyNiwxMCArMTI2LDggQEAg c3RydWN0IEtpc1dpbmRvd0xheW91dFJlc291cmNlOjpQcml2YXRlCiAgICAgICAgICAgICAgICAg bWFpbldpbmRvdy0+c2hvdygpOwogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgfQotCi0g ICAgdm9pZCBjbG9zZVVubmVlZGVkV2luZG93cyhRTGlzdDxRUG9pbnRlcjxLaXNNYWluV2luZG93 Pj4gJmN1cnJlbnRXaW5kb3dzKSB7Ci0gICAgICAgIFFWZWN0b3I8UVBvaW50ZXI8S2lzTWFpbldp bmRvdz4+IHdpbmRvd3NUb0Nsb3NlOworICAgICAgICAKKyAgICAgICAgUVZlY3RvcjxRUG9pbnRl cjxLaXNNYWluV2luZG93Pj4gd2luZG93c1RvTWlncmF0ZTsKIAogICAgICAgICBRX0ZPUkVBQ0go S2lzTWFpbldpbmRvdyAqbWFpbldpbmRvdywgY3VycmVudFdpbmRvd3MpIHsKICAgICAgICAgICAg IGJvb2wga2VlcCA9IGZhbHNlOwpAQCAtMTQxLDggKzEzOSw4IEBAIHN0cnVjdCBLaXNXaW5kb3dM YXlvdXRSZXNvdXJjZTo6UHJpdmF0ZQogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAo IWtlZXApIHsKLSAgICAgICAgICAgICAgICB3aW5kb3dzVG9DbG9zZS5hcHBlbmQobWFpbldpbmRv dyk7Ci0KKyAgICAgICAgICAgICAgICB3aW5kb3dzVG9NaWdyYXRlLmFwcGVuZChtYWluV2luZG93 KTsKKyAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAvLyBTZXQgdGhlIHdpbmRvdyBo aWRkZW4gdG8gcHJldmVudCAic2hvdyBpbWFnZSBpbiBhbGwgd2luZG93cyIgZmVhdHVyZSBmcm9t IG9wZW5pbmcgbmV3IHZpZXdzIG9uIGl0CiAgICAgICAgICAgICAgICAgLy8gd2hpbGUgd2UgbWln cmF0ZSB2aWV3cyBvbnRvIHRoZSByZW1haW5pbmcgd2luZG93cwogICAgICAgICAgICAgICAgIGlm IChtYWluV2luZG93LT5pc1Zpc2libGUoKSkgewpAQCAtMTUwLDExICsxNDgsMjUgQEAgc3RydWN0 IEtpc1dpbmRvd0xheW91dFJlc291cmNlOjpQcml2YXRlCiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIAorICAgICAgICBtaWdyYXRlVmlld3NGcm9t Q2xvc2luZ1dpbmRvd3Mod2luZG93c1RvTWlncmF0ZSk7CisgICAgfQogCi0gICAgICAgIG1pZ3Jh dGVWaWV3c0Zyb21DbG9zaW5nV2luZG93cyh3aW5kb3dzVG9DbG9zZSk7CisgICAgdm9pZCBjbG9z ZVVubmVlZGVkV2luZG93cyhRTGlzdDxRUG9pbnRlcjxLaXNNYWluV2luZG93Pj4gJmN1cnJlbnRX aW5kb3dzKSB7CisgICAgICAgIFFWZWN0b3I8UVBvaW50ZXI8S2lzTWFpbldpbmRvdz4+IHdpbmRv d3NUb0Nsb3NlOworCisgICAgICAgIFFfRk9SRUFDSChLaXNNYWluV2luZG93ICptYWluV2luZG93 LCBjdXJyZW50V2luZG93cykgeworICAgICAgICAgICAgYm9vbCBrZWVwID0gZmFsc2U7CisgICAg ICAgICAgICBRX0ZPUkVBQ0goY29uc3QgV2luZG93ICZ3aW5kb3csIHdpbmRvd3MpIHsKKyAgICAg ICAgICAgICAgICBpZiAod2luZG93LndpbmRvd0lkID09IG1haW5XaW5kb3ctPmlkKCkpIHsKKyAg ICAgICAgICAgICAgICAgICAga2VlcCA9IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KIAotICAgICAgICBRX0ZPUkVBQ0go UVBvaW50ZXI8S2lzTWFpbldpbmRvdz4gbWFpbldpbmRvdywgd2luZG93c1RvQ2xvc2UpIHsKLSAg ICAgICAgICAgIG1haW5XaW5kb3ctPmNsb3NlKCk7CisgICAgICAgICAgICBpZiAoIWtlZXApIHsK KyAgICAgICAgICAgICAgICBtYWluV2luZG93LT5jbG9zZSgpOworICAgICAgICAgICAgfQogICAg ICAgICB9CiAgICAgfQogCkBAIC0yNDgsOCArMjYwLDkgQEAgdm9pZCBLaXNXaW5kb3dMYXlvdXRS ZXNvdXJjZTo6YXBwbHlMYXlvdXQoKQogICAgIGxheW91dE1hbmFnZXItPnNldExhc3RVc2VkTGF5 b3V0KHRoaXMpOwogCiAgICAgUUxpc3Q8UVBvaW50ZXI8S2lzTWFpbldpbmRvdz4+IGN1cnJlbnRX aW5kb3dzID0ga2lzUGFydC0+bWFpbldpbmRvd3MoKTsKKyAgICBib29sIGNyZWF0ZVdpbmRvd3Mg PSBkLT53aW5kb3dzLmlzRW1wdHkoKTsKIAotICAgIGlmIChkLT53aW5kb3dzLmlzRW1wdHkoKSkg eworICAgIGlmIChjcmVhdGVXaW5kb3dzKSB7CiAgICAgICAgIC8vIE5vIHdpbmRvd3MgZGVmaW5l ZCAoZS5nLiBmcmVzaCBuZXcgc2Vzc2lvbikuIExlYXZlIHRoaW5ncyBhcyB0aGV5IGFyZSwgYnV0 IG1ha2Ugc3VyZSB0aGVyZSdzIGF0IGxlYXN0IG9uZSB2aXNpYmxlIG1haW4gd2luZG93CiAgICAg ICAgIGlmIChraXNQYXJ0LT5tYWlud2luZG93Q291bnQoKSA9PSAwKSB7CiAgICAgICAgICAgICBr aXNQYXJ0LT5jcmVhdGVNYWluV2luZG93KCk7CkBAIC0yNTgsNyArMjcxLDYgQEAgdm9pZCBLaXNX aW5kb3dMYXlvdXRSZXNvdXJjZTo6YXBwbHlMYXlvdXQoKQogICAgICAgICB9CiAgICAgfSBlbHNl IHsKICAgICAgICAgZC0+b3Blbk5lY2Vzc2FyeVdpbmRvd3MoY3VycmVudFdpbmRvd3MpOwotICAg ICAgICBkLT5jbG9zZVVubmVlZGVkV2luZG93cyhjdXJyZW50V2luZG93cyk7CiAgICAgfQogCiAg ICAgLy8gV2FpdCBmb3IgdGhlIHdpbmRvd3MgdG8gZmluaXNoIG9wZW5pbmcgLyBjbG9zaW5nIGJl Zm9yZSBhcHBseWluZyBzYXZlZCBnZW9tZXRyeS4KQEAgLTMwMCw2ICszMTIsOSBAQCB2b2lkIEtp c1dpbmRvd0xheW91dFJlc291cmNlOjphcHBseUxheW91dCgpCiAKICAgICBsYXlvdXRNYW5hZ2Vy LT5zZXRTaG93SW1hZ2VJbkFsbFdpbmRvd3NFbmFibGVkKGQtPnNob3dJbWFnZUluQWxsV2luZG93 cyk7CiAgICAgbGF5b3V0TWFuYWdlci0+c2V0UHJpbWFyeVdvcmtzcGFjZUZvbGxvd3NGb2N1cyhk LT5wcmltYXJ5V29ya3NwYWNlRm9sbG93c0ZvY3VzLCBkLT5wcmltYXJ5V2luZG93KTsKKyAgICBp ZiAoIWNyZWF0ZVdpbmRvd3MpIHsKKyAgICAgICAgZC0+Y2xvc2VVbm5lZWRlZFdpbmRvd3MoY3Vy cmVudFdpbmRvd3MpOworICAgIH0KIH0KIAogYm9vbCBLaXNXaW5kb3dMYXlvdXRSZXNvdXJjZTo6 c2F2ZVRvRGV2aWNlKFFJT0RldmljZSAqZGV2KSBjb25zdAo=