void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle webview crash

Browse source
This commit is contained in:
Ilya Fedin 2023-12-23 19:15:03 +04:00 • committed by John Preston
parent cb4fce251e
commit d63ebbe62c
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/SourceFiles/payments/ui/payments_panel.cpp
View file

@ -567,10 +567,17 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
if (!raw->widget()) { if (!raw->widget()) {
return false; return false;
} }
QObject::connect(raw->widget(), &QObject::destroyed, [=] {
crl::on_main(this, [=] {
showCriticalError({ "Error: WebView has crashed." });
});
});
container->geometryValue( container->geometryValue(
) | rpl::start_with_next([=](QRect geometry) { ) | rpl::start_with_next([=](QRect geometry) {
raw->widget()->setGeometry(geometry); if (raw->widget()) {
raw->widget()->setGeometry(geometry);
}
}, _webview->lifetime); }, _webview->lifetime);
raw->setMessageHandler([=](const QJsonDocument &message) { raw->setMessageHandler([=](const QJsonDocument &message) {

3
Telegram/SourceFiles/payments/ui/payments_panel.h
View file

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once #pragma once
#include "base/object_ptr.h" #include "base/object_ptr.h"
#include "base/weak_ptr.h"
namespace Ui { namespace Ui {
class Show; class Show;
@ -39,7 +40,7 @@ struct PaymentMethodDetails;
struct PaymentMethodAdditional; struct PaymentMethodAdditional;
struct NativeMethodDetails; struct NativeMethodDetails;
class Panel final { class Panel final : public base::has_weak_ptr {
public: public:
explicit Panel(not_null<PanelDelegate*> delegate); explicit Panel(not_null<PanelDelegate*> delegate);
~Panel(); ~Panel();

9
Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
View file

@ -603,10 +603,17 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
if (!raw->widget()) { if (!raw->widget()) {
return false; return false;
} }
QObject::connect(raw->widget(), &QObject::destroyed, [=] {
crl::on_main(this, [=] {
showCriticalError({ "Error: WebView has crashed." });
});
});
container->geometryValue( container->geometryValue(
) | rpl::start_with_next([=](QRect geometry) { ) | rpl::start_with_next([=](QRect geometry) {
raw->widget()->setGeometry(geometry); if (raw->widget()) {
raw->widget()->setGeometry(geometry);
}
}, _webview->lifetime); }, _webview->lifetime);
raw->setMessageHandler([=](const QJsonDocument &message) { raw->setMessageHandler([=](const QJsonDocument &message) {

2
Telegram/lib_webview

@ -1 +1 @@
Subproject commit 3495eb8dd8f4e2dab9493b4a698e5006fadbca47 Subproject commit c83478cd5ce2eb6fb343d9c96cec31688fe6d5f6