From 437efa699aa6ff566ff19737546dd19cfc93b989 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Thu, 23 Jul 2020 11:55:59 +0300 Subject: Prevent crash if duplicating a slide with actions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QT3DS-4148 Change-Id: I48f22ba34aab42aa9d42d7b6b57ff8fe7a2e38d6 Reviewed-by: Antti Määttä Reviewed-by: Tomi Korpipää --- src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp') diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp index 202736d8..707fab50 100644 --- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp @@ -3666,7 +3666,8 @@ public: for (size_t idx = 0, end = slideInstances.size(); idx < end; ++idx) { TInstanceHandle theInstance(slideInstances[idx]); if (m_SlideSystem.GetApplicableSlide(theInstance) - != m_SlideSystem.GetMasterSlide(theInstance)) { + != m_SlideSystem.GetMasterSlide(theInstance) + && !m_Bridge.GetName(theInstance).IsEmpty()) { SetName(theInstance, m_Bridge.GetName(theInstance), true); } } -- cgit v1.2.3