Add upstream patch for avoiding destruction of TLWs that were never created

Fixes assert during Filezilla startup (#1484955)
epel8
Scott Talbert 8 years ago
parent 4962199795
commit 24e848fad8

@ -0,0 +1,29 @@
From ce1dce113c5eda42f49ba3278bb21c61872ca37d Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Mon, 28 Aug 2017 20:31:47 -0700
Subject: [PATCH] Avoid delayed destruction if TLW was never created. See
#17942
(cherry picked from commit 4a71ba820f085a3d5a7233e9fd0e23ae4e45af58)
---
src/common/toplvcmn.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index ef693690c5d..6a722f8be48 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -105,10 +105,10 @@ bool wxTopLevelWindowBase::Destroy()
// as we will be deleted anyhow during its destruction and the pointer
// stored in wxPendingDelete would become invalid, so just delete ourselves
// immediately in this case.
- if ( wxWindow* parent = GetParent() )
+ wxWindow* parent = GetParent();
+ if ( (parent && parent->IsBeingDeleted()) || !GetHandle() )
{
- if ( parent->IsBeingDeleted() )
- return wxNonOwnedWindow::Destroy();
+ return wxNonOwnedWindow::Destroy();
}
// delayed destruction: the frame will be deleted during the next idle

@ -20,7 +20,7 @@
Name: %{wxgtkname}
Version: 3.0.3
Release: 4%{?snapshottag}%{?dist}
Release: 5%{?snapshottag}%{?dist}
Summary: GTK port of the wxWidgets GUI library
License: wxWidgets
Group: System Environment/Libraries
@ -43,6 +43,8 @@ Patch0: %{name}-%{version}-abicheck.patch
%if 0%{?fedora} > 25
Patch1: %{name}-%{version}-webkit2.patch
%endif
# https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d
Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch
BuildRequires: gtk%{gtkver}-devel
#Note webkitgtk (GTK2) does not appear to be supported
@ -376,6 +378,10 @@ fi
%doc docs/doxygen/out/xml/*
%changelog
* Wed Aug 30 2017 Scott Talbert <swt@techie.net> - 3.0.3-5
- Add upstream patch for avoiding destruction of TLWs that were never created
- Fixes assert during Filezilla startup (#1484955)
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

Loading…
Cancel
Save