From 26b9b20fe7e463af18f6d12df3df21dfdf840896 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Wed, 11 Mar 2009 00:26:16 +0100
Subject: [PATCH] Upstream tarball 9501

---
 .svn-revision            | 2 +-
 docs/Changelog           | 1 +
 src/amule-remote-gui.cpp | 5 +++--
 src/amule.cpp            | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 4eea0f3a..42c3a926 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9499
+9501
diff --git a/docs/Changelog b/docs/Changelog
index ad66ac49..08166c36 100644
--- a/docs/Changelog
+++ b/docs/Changelog
@@ -118,6 +118,7 @@ Version 2.2.4 - The "don't know yet if there will be another 2.2" version.
 		* Fixed finished files sometimes getting rehashed (thanks to Skolnick)
 		* Added restart warning if the ED2K network was re-enabled.
 		* Fixed Windows lag when opening preferences dialog
+		* Fixed creation of ED2K links with AICH (thanks to Archmage)
 
 	Wuischke:
 		* Add Asturian language
diff --git a/src/amule-remote-gui.cpp b/src/amule-remote-gui.cpp
index 06d50305..74ba3649 100644
--- a/src/amule-remote-gui.cpp
+++ b/src/amule-remote-gui.cpp
@@ -516,10 +516,11 @@ wxString CamuleRemoteGuiApp::CreateED2kAICHLink(const CKnownFile* f)
 	wxString strURL = CreateED2kLink(f);
 	// Append the AICH info
 	if (f->HasProperAICHHashSet()) {
-	     	strURL << wxT("|h=") << f->GetAICHMasterHash() << wxT("|/");
+		strURL.RemoveLast();		// remove trailing '/'
+		strURL << wxT("h=") << f->GetAICHMasterHash() << wxT("|/");
 	}	
 
-	// Result is "ed2k://|file|<filename>|<size>|<hash>|/|h=<AICH master hash>|/"
+	// Result is "ed2k://|file|<filename>|<size>|<hash>|h=<AICH master hash>|/"
 	return strURL;
 }
 
diff --git a/src/amule.cpp b/src/amule.cpp
index 501ae5b3..5b8bcae7 100644
--- a/src/amule.cpp
+++ b/src/amule.cpp
@@ -1093,10 +1093,11 @@ wxString CamuleApp::CreateED2kAICHLink(const CKnownFile* f)
 	wxString strURL = CreateED2kLink(f);
 	// Append the AICH info
 	if (f->HasProperAICHHashSet()) {
-	     	strURL << wxT("|h=") << f->GetAICHMasterHash() << wxT("|/");
+		strURL.RemoveLast();		// remove trailing '/'
+		strURL << wxT("h=") << f->GetAICHMasterHash() << wxT("|/");
 	}	
 
-	// Result is "ed2k://|file|<filename>|<size>|<hash>|/|h=<AICH master hash>|/"
+	// Result is "ed2k://|file|<filename>|<size>|<hash>|h=<AICH master hash>|/"
 	return strURL;
 }
 
-- 
2.11.4.GIT