diff options
author | Martin Kampas <martin.kampas@jolla.com> | 2016-09-13 15:11:49 +0200 |
---|---|---|
committer | Juergen Bocklage-Ryannel <juergen.bocklage-ryannel@pelagicore.com> | 2016-10-04 18:10:56 +0000 |
commit | 0977872016c86555eac9c99604b2de384528fe62 (patch) | |
tree | bd9a86155314c3d96d4f119720ac1edf9477a35f | |
parent | 6b12401fb8d55915b9a0840affeee5b80b7f2892 (diff) |
LiveNodeEngine: Clear fallbackView source unconditionally
This is especially important on the very first reloadDocument call when
(m_activeWindow == m_fallbackView) cannot be true and yet the
fallbackView may have been used to load a component outside of
LiveNodeEngine before.
Change-Id: Id2456def3591ab61ae693270f58b549f459fcaec
Reviewed-by: Juergen Bocklage-Ryannel <juergen.bocklage-ryannel@pelagicore.com>
-rw-r--r-- | src/livenodeengine.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/livenodeengine.cpp b/src/livenodeengine.cpp index acea54f..fe8a87f 100644 --- a/src/livenodeengine.cpp +++ b/src/livenodeengine.cpp @@ -333,6 +333,9 @@ QUrl LiveNodeEngine::errorScreenUrl() const * Reloads the active qml document. * * Emits documentLoaded() when finished. + * + * If \l fallbackView is set, its \c source will be cleared, whether the view + * was previously used or not. */ void LiveNodeEngine::reloadDocument() { @@ -342,7 +345,8 @@ void LiveNodeEngine::reloadDocument() disconnect(m_activeWindowConnections.takeLast()); } - if (m_fallbackView && m_activeWindow == m_fallbackView) { + // Do this unconditionally! + if (m_fallbackView) { m_fallbackView->setSource(QUrl()); m_fallbackView->close(); } |