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

Fix wrong "Webview process crashed." message.

Browse source
This commit is contained in:
John Preston 2024-01-04 18:17:52 +04:00
parent 3b50bc71b3
commit 16a2d4ec96
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ Panel::Panel(not_null<PanelDelegate*> delegate)
} }
Panel::~Panel() { Panel::~Panel() {
_webview = nullptr; base::take(_webview);
_progress = nullptr; _progress = nullptr;
_widget = nullptr; _widget = nullptr;
} }
@ -528,6 +528,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
auto outer = base::make_unique_q<RpWidget>(_widget.get()); auto outer = base::make_unique_q<RpWidget>(_widget.get());
const auto container = outer.get(); const auto container = outer.get();
_widget->showInner(std::move(outer)); _widget->showInner(std::move(outer));
const auto webviewParent = QPointer<RpWidget>(container);
_webviewBottom = std::make_unique<RpWidget>(_widget.get()); _webviewBottom = std::make_unique<RpWidget>(_widget.get());
const auto bottom = _webviewBottom.get(); const auto bottom = _webviewBottom.get();
@ -552,7 +553,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
const auto raw = &_webview->window; const auto raw = &_webview->window;
QObject::connect(container, &QObject::destroyed, [=] { QObject::connect(container, &QObject::destroyed, [=] {
if (_webview && &_webview->window == raw) { if (_webview && &_webview->window == raw) {
_webview = nullptr; base::take(_webview);
if (_webviewProgress) { if (_webviewProgress) {
hideWebviewProgress(); hideWebviewProgress();
if (_progress && !_progress->shown) { if (_progress && !_progress->shown) {
@ -568,6 +569,16 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
return false; return false;
} }
QObject::connect(raw->widget(), &QObject::destroyed, [=] { QObject::connect(raw->widget(), &QObject::destroyed, [=] {
const auto parent = webviewParent.data();
if (!_webview
|| &_webview->window != raw
|| !parent
|| _widget->inner() != parent) {
// If we destroyed _webview ourselves,
// or if we changed _widget->inner ourselves,
// we don't show any message, nothing crashed.
return;
}
crl::on_main(this, [=] { crl::on_main(this, [=] {
showCriticalError({ "Error: WebView has crashed." }); showCriticalError({ "Error: WebView has crashed." });
}); });

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

@ -364,7 +364,7 @@ Panel::Panel(
} }
Panel::~Panel() { Panel::~Panel() {
_webview = nullptr; base::take(_webview);
_progress = nullptr; _progress = nullptr;
_widget = nullptr; _widget = nullptr;
} }
@ -587,7 +587,7 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
QObject::connect(container, &QObject::destroyed, [=] { QObject::connect(container, &QObject::destroyed, [=] {
if (_webview && &_webview->window == raw) { if (_webview && &_webview->window == raw) {
_webview = nullptr; base::take(_webview);
if (_webviewProgress) { if (_webviewProgress) {
hideWebviewProgress(); hideWebviewProgress();
if (_progress && !_progress->shown) { if (_progress && !_progress->shown) {
@ -604,6 +604,16 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
return false; return false;
} }
QObject::connect(raw->widget(), &QObject::destroyed, [=] { QObject::connect(raw->widget(), &QObject::destroyed, [=] {
const auto parent = _webviewParent.data();
if (!_webview
|| &_webview->window != raw
|| !parent
|| _widget->inner() != parent) {
// If we destroyed _webview ourselves,
// or if we changed _widget->inner ourselves,
// we don't show any message, nothing crashed.
return;
}
crl::on_main(this, [=] { crl::on_main(this, [=] {
showCriticalError({ "Error: WebView has crashed." }); showCriticalError({ "Error: WebView has crashed." });
}); });

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 7fef09421c2b71e5ab9cf481c0fcf2a0b6d2daf0 Subproject commit 30c5dfe6f65babf234c889959061c97c4a2f391d