Handle webview crash

TelegramOrg · Dec 23, 2023 · d63ebbe · d63ebbe
1 parent cb4fce2
commit d63ebbe
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -567,10 +567,17 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 	if (!raw->widget()) {
 		return false;
 	}
+	QObject::connect(raw->widget(), &QObject::destroyed, [=] {
+		crl::on_main(this, [=] {
+			showCriticalError({ "Error: WebView has crashed." });
+		});
+	});
 
 	container->geometryValue(
 	) | rpl::start_with_next([=](QRect geometry) {
-		raw->widget()->setGeometry(geometry);
+		if (raw->widget()) {
+			raw->widget()->setGeometry(geometry);
+		}
 	}, _webview->lifetime);
 
 	raw->setMessageHandler([=](const QJsonDocument &message) {

diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.h b/Telegram/SourceFiles/payments/ui/payments_panel.h
@@ -8,6 +8,7 @@ For license and copyright information please follow this link:
 #pragma once
 
 #include "base/object_ptr.h"
+#include "base/weak_ptr.h"
 
 namespace Ui {
 class Show;
@@ -39,7 +40,7 @@ struct PaymentMethodDetails;
 struct PaymentMethodAdditional;
 struct NativeMethodDetails;
 
-class Panel final {
+class Panel final : public base::has_weak_ptr {
 public:
 	explicit Panel(not_null<PanelDelegate*> delegate);
 	~Panel();

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

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
+1 −4		webview/platform/linux/webview_linux_webkitgtk.cpp
+1 −1		webview/webview_embed.cpp