diff options
| author | Frank Reininghaus <[email protected]> | 2014-02-02 10:19:57 +0100 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-02-02 10:19:57 +0100 |
| commit | 75c0f240200c2ee06d5f46893b9e55f51b870881 (patch) | |
| tree | d69142df0870cc39f399ef477943ab4274f0d997 /src | |
| parent | 900a4ba3b9213802c2c7a5329f88704f9f664c70 (diff) | |
Restore the URLs of both views correctly when restoring a session
The problem was that we restored the URL of the right view while the
left one is still active. When we received the signal
urlChanged(KUrl& url) from the right URL navigator, we then set the URL
of the active (i.e., left) view to 'url', such that both views showed
the same URL.
BUG: 330047
FIXED-IN: 4.12.3
REVIEW: 115406
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinmainwindow.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index a4dbb6f34..847301434 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -677,6 +677,13 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group) Q_ASSERT(cont); } + // The right view must be activated before the URL is set. Changing + // the URL in the right view will emit the right URL navigator's + // urlChanged(KUrl) signal, which is connected to the changeUrl(KUrl) + // slot. That slot will change the URL in the left view if it is still + // active. See https://bugs.kde.org/show_bug.cgi?id=330047. + setActiveViewContainer(cont); + cont->setUrl(secondaryUrl); const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false); cont->urlNavigator()->setUrlEditable(editable); |
