Reviewed by John.

[WebKit-https.git] / WebCore / khtml / khtml_part.cpp

diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 66532000897444df475a61674cf8738f8034231a..6fa13fa56f9fd71413a7405f174324fdf3e52502 100644 (file)
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1990,6 +1990,13 @@ bool KHTMLPart::isImmediateRedirectPending() const
 
 void KHTMLPart::scheduleHistoryNavigation( int steps )
 {
+#if APPLE_CHANGES
+    // navigation will always be allowed in the 0 steps case, which is OK because
+    // that's supposed to force a reload.
+    if (!KWQ(this)->canGoBackOrForward(steps))
+        return;
+#endif
+
     d->m_scheduledRedirection = historyNavigationScheduled;
     d->m_delayRedirect = 0;
     d->m_redirectURL = QString::null;