[Dooble-Development] SF.net SVN: dooble:[3709] branches/1.27/browser/Source/dooble.cc

[<tex...@us...>]

Revision: 3709
          http://dooble.svn.sourceforge.net/dooble/?rev=3709&view=rev
Author:   textfield
Date:     2011-12-26 17:30:41 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Incorrect back and forward navigation menus.

Modified Paths:
--------------
    branches/1.27/browser/Source/dooble.cc

Modified: branches/1.27/browser/Source/dooble.cc
===================================================================
--- branches/1.27/browser/Source/dooble.cc	2011-12-25 23:28:13 UTC (rev 3708)
+++ branches/1.27/browser/Source/dooble.cc	2011-12-26 17:30:41 UTC (rev 3709)
@@ -2300,10 +2300,8 @@
 
 	  if(ui.tabWidget->tabText(index) == tr("Loading..."))
 	    {
-	      ui.tabWidget->setTabText
-		(ui.tabWidget->indexOf(p), tr("(Untitled)"));
-	      ui.tabWidget->setTabToolTip
-		(ui.tabWidget->indexOf(p), tr("(Untitled)"));
+	      ui.tabWidget->setTabText(index, tr("(Untitled)"));
+	      ui.tabWidget->setTabToolTip(index, tr("(Untitled)"));
 	    }
 
 	  ui.tabWidget->animateIndex(index, false, p->icon());
@@ -2426,10 +2424,15 @@
 	}
     }
 
-  prepareNavigationButtonMenus(p);
-
   if(p == qobject_cast<dview *> (ui.tabWidget->currentWidget()))
     {
+      /*
+      ** The navigation menus (back/forward) should only be prepared
+      ** if the current tab is the one whose load finished.
+      */
+
+      prepareNavigationButtonMenus(p);
+
       if(!ui.locationLineEdit->hasFocus() &&
 	 !ui.locationLineEdit->isModified() &&
 	 !p->url().isEmpty() && p->url().isValid())

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.