[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/jsdialog

[Szymon KÅ‚os (via logerrit)]

 vcl/jsdialog/jsdialogbuilder.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 845ae6fbb7e187cd9daed1e4731a1c9e635ec976
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Jun 18 14:08:48 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Jun 24 14:01:24 2020 +0200

    jsdialog: always clean remember widgets
    
    avoid crash when old, freed widged will be used
    
    Change-Id: I4f4ec40bc8d1fdda4a141d1167c05d863d516633
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97014
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index ba19912db0a2..24919571861c 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -93,11 +93,7 @@ JSInstanceBuilder::JSInstanceBuilder(vcl::Window* pParent, const OUString& rUIRo
     }
 }
 
-JSInstanceBuilder::~JSInstanceBuilder()
-{
-    if (m_nWindowId && m_bHasTopLevelDialog)
-        GetLOKWeldWidgetsMap().erase(m_nWindowId);
-}
+JSInstanceBuilder::~JSInstanceBuilder() { GetLOKWeldWidgetsMap().erase(m_nWindowId); }
 
 std::map<vcl::LOKWindowId, WidgetMap>& JSInstanceBuilder::GetLOKWeldWidgetsMap()
 {