summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-05 09:37:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-05 09:37:05 -0600
commit687b1460b969af4f942233605abcca3a9b3c7f23 (patch)
tree24f89f5b32946e717b216dbb0175dc1d964a4ecd
parent9f12da87f187175e6a62b432980cfa9c441e5b66 (diff)
downloadtdebase-687b1460b969af4f942233605abcca3a9b3c7f23.tar.gz
tdebase-687b1460b969af4f942233605abcca3a9b3c7f23.zip
Fix rare incorrect section display on load request when khelpcenter instance already running
This resolves Bug 2188
-rw-r--r--khelpcenter/mainwindow.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index c2246232a..d99dfcb2b 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -293,6 +293,8 @@ void MainWindow::viewUrl( const TQString &url )
void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
{
+ KParts::URLArgs urlArgs = args;
+
stop();
TQString proto = url.protocol().lower();
@@ -323,7 +325,15 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
History::self().createEntry();
- mDoc->browserExtension()->setURLArgs( args );
+ if (mDoc->baseURL() != url) {
+ if ( proto == "help" ) {
+ // Ensure that changing the handbook section works by forcing a reload of the page,
+ // thereby allowing the help tdeioslave to re-parse the fragment identifier
+ urlArgs.reload = true;
+ mDoc->gotoAnchor("");
+ }
+ }
+ mDoc->browserExtension()->setURLArgs( urlArgs );
if ( proto == TQString::fromLatin1("glossentry") ) {
TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );