From 932acf2e11c7a191a1626d8daa90836a3d7c69d4 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 9 May 2016 20:14:15 +0300
Subject: [PATCH] Merge with develop

---
 code/nel/src/gui/url_parser.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/nel/src/gui/url_parser.cpp b/code/nel/src/gui/url_parser.cpp
index 68d4f8496..7369289f2 100644
--- a/code/nel/src/gui/url_parser.cpp
+++ b/code/nel/src/gui/url_parser.cpp
@@ -78,7 +78,7 @@ namespace NLGUI
 		pos = uri.find("?");
 		if (pos != npos)
 		{
-			query = uri.substr(pos + 1);
+			query = uri.substr(pos);
 			uri = uri.substr(0, pos);
 		}
 
@@ -210,7 +210,9 @@ namespace NLGUI
 			result += path;
 
 		if (!query.empty())
-			result += "?" + query;
+			if (query.find_first_of("?") != 0)
+				result += "?";
+			result += query;
 
 		if (!hash.empty())
 			result += "#" + hash;