diff --git a/code/nel/src/gui/url_parser.cpp b/code/nel/src/gui/url_parser.cpp index 68f624743..da222f807 100644 --- a/code/nel/src/gui/url_parser.cpp +++ b/code/nel/src/gui/url_parser.cpp @@ -228,15 +228,21 @@ namespace NLGUI // path already has leading slash if (!path.empty()) + { result += path; + } if (!query.empty()) - if (query.find_first_of("?") != 0) - result += "?"; + { + if (query.find_first_of("?") != 0) result += "?"; + result += query; + } if (!hash.empty()) + { result += "#" + hash; + } return result; } diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp index 76e664bc0..9efcf41b2 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp @@ -3195,17 +3195,20 @@ class CHandlerGameConfigMode : public IActionHandler bool bFound = false; string tmp = toString(VideoModes[i].Frequency); for (j = 0; j < (sint)stringFreqList.size(); ++j) + { if (stringFreqList[j] == tmp) { bFound = true; break; } - if (!bFound) - { - stringFreqList.push_back(tmp); - if (ClientCfg.Frequency == VideoModes[i].Frequency) - nFoundFreq = j; - } + } + + if (!bFound) + { + stringFreqList.push_back(tmp); + if (ClientCfg.Frequency == VideoModes[i].Frequency) + nFoundFreq = j; + } } } if (nFoundFreq == -1) nFoundFreq = 0;