From: TimePath Date: Sun, 6 Aug 2017 02:45:22 +0000 (+0000) Subject: Merge branch 'smooth' into 'master' X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=569c0d2b9f44331d0b9c0ae7594147efb9e632e1;hp=a726c43661057f338f342f13c93ee0fe76698cf7;p=xonotic%2Fnetradiant.git Merge branch 'smooth' into 'master' Smoothing stuff See merge request !70 --- diff --git a/radiant/main.cpp b/radiant/main.cpp index f86b1895..93de25c9 100644 --- a/radiant/main.cpp +++ b/radiant/main.cpp @@ -324,14 +324,7 @@ void streams_init(){ } void paths_init(){ - const char* home = environment_get_home_path(); - Q_mkdir( home ); - - { - StringOutputStream path( 256 ); - path << home << "/"; - g_strSettingsPath = path.c_str(); - } + g_strSettingsPath = environment_get_home_path(); Q_mkdir( g_strSettingsPath.c_str() ); diff --git a/radiant/url.cpp b/radiant/url.cpp index b1603ecc..e92d1ba1 100644 --- a/radiant/url.cpp +++ b/radiant/url.cpp @@ -38,7 +38,7 @@ bool open_url( const char* url ){ bool open_url( const char* url ){ char command[2 * PATH_MAX]; snprintf( command, sizeof( command ), - "xdg-open \"%s\" &", url, url ); + "xdg-open \"%s\" &", url ); return system( command ) == 0; } #endif