From 2aef2468970e84bd959d39a8ddeff42c05f2a517 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sun, 18 Jan 2015 14:40:29 +0100 Subject: [PATCH 1/2] Fix #1824 - Hardware stats sends duplicate data --- src/config/hardware_stats.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/config/hardware_stats.cpp b/src/config/hardware_stats.cpp index 6780fa5ad..900733b64 100644 --- a/src/config/hardware_stats.cpp +++ b/src/config/hardware_stats.cpp @@ -313,9 +313,6 @@ void reportHardwareStats() std::string vendor, renderer, full_version; irr_driver->getOpenGLData(&vendor, &renderer, &full_version); - json.add("GL_VENDOR", vendor ); - json.add("GL_RENDERER", renderer ); - json.add("GL_VERSION", full_version ); json.add("gfx_drv_ver", "OpenGL "+vendor); std::string card_name = vendor; From ded59ac81e41a084851386f91766780169cf299d Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sun, 18 Jan 2015 23:40:56 +0100 Subject: [PATCH 2/2] Fix #1822 - Addons xml file contains wrong xmlns path --- src/addons/addons_manager.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/addons/addons_manager.cpp b/src/addons/addons_manager.cpp index 3fe7ff51f..f5f7e8d5f 100644 --- a/src/addons/addons_manager.cpp +++ b/src/addons/addons_manager.cpp @@ -583,13 +583,19 @@ bool AddonsManager::uninstall(const Addon &addon) */ void AddonsManager::saveInstalled() { - //Put the addons in the xml file - //Manually because the irrlicht xml writer doesn't seem finished, FIXME ? + // Put the addons in the xml file + // Manually because the irrlicht xml writer doesn't seem finished, FIXME ? std::ofstream xml_installed(m_file_installed.c_str()); - //write the header of the xml file + // Write the header of the xml file xml_installed << "" << std::endl; - xml_installed << "" + + // Get server address from config + std::string server = UserConfigParams::m_server_addons; + // Find the third slash (end of the domain) + std::string::size_type index = server.find('/'); + index = server.find('/', index + 2) + 1; // Omit one slash + xml_installed << "" << std::endl; for(unsigned int i = 0; i < m_addons_list.getData().size(); i++)