linuxdcpp-team team mailing list archive

Thread
Date

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2389: fix spamming of the file list address bar when searching

To: LinuxDC++ Team <linuxdcpp-team@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 10 Jan 2011 22:43:28 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2389
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2011-01-10 23:40:51 +0100
message:
  fix spamming of the file list address bar when searching
modified:
  help/po/de.po
  win32/DirectoryListingFrame.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'help/po/de.po'
--- help/po/de.po	2011-01-10 22:12:39 +0000
+++ help/po/de.po	2011-01-10 22:40:51 +0000
@@ -2267,11 +2267,6 @@
 "+.  You can find some more how-to's for popular router models at the <a po4a-"
 "id=1>DSLReport FAQ page</a> as well."
 msgstr ""
-"Du findet detaillierte how-to guides mit Screenshots fÃ¼r verschiedene Router-"
-"Modelle auf <a po4a-id=0>www.portforward.com</a> (Englisch). Es gibt dort "
-"eine groÃŸe Liste an Modellen. WÃ¤hle dein Modell aus und DC++ aus der "
-"Programmliste auf der nÃ¤chsten Seite. Ein Guide leitet dich durch die "
-"einzelnen Schritte."
 
 #. type: Content of: <html><body><p>
 #: help/faq_activemode.html:84

=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp	2011-01-10 21:49:08 +0000
+++ win32/DirectoryListingFrame.cpp	2011-01-10 22:40:51 +0000
@@ -1014,13 +1014,21 @@
 
 	HTREEITEM const oldDir = dirs->getSelected();
 
-	auto selectDir = [this, oldDir](HTREEITEM newDir) {
+	auto prevHistory = history;
+	auto prevHistoryIndex = historyIndex;
+
+	auto selectDir = [this, oldDir, &prevHistory, prevHistoryIndex](HTREEITEM newDir) {
 		// SelectItem won't update the list if SetRedraw was set to FALSE and then
 		// to TRUE and the selected item is the same as the last one... workaround:
 		if(newDir == oldDir)
 			dirs->setSelected(nullptr);
 		dirs->setSelected(newDir);
 		dirs->ensureVisible(newDir);
+
+		if(newDir == oldDir) {
+			history = prevHistory;
+			historyIndex = prevHistoryIndex;
+		}
 	};
 
 	if(mode == FIND_START) {