|
|
|
@ -1027,10 +1027,10 @@ void Configuration::GenerateColumns() |
|
|
|
|
|
|
|
|
|
|
|
void Configuration::MakeProperPath(std::string &dir) |
|
|
|
void Configuration::MakeProperPath(std::string &dir) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (dir.empty()) |
|
|
|
if (dir.length() < 2) |
|
|
|
return; |
|
|
|
return; |
|
|
|
if (dir[0] == '~') |
|
|
|
if (dir[0] == '~' && dir[1] == '/') |
|
|
|
dir.replace(0, 1, home_directory); |
|
|
|
dir.replace(0, 2, home_directory); |
|
|
|
std::replace(dir.begin(), dir.end(), '\\', '/'); |
|
|
|
std::replace(dir.begin(), dir.end(), '\\', '/'); |
|
|
|
if (*dir.rbegin() != '/') |
|
|
|
if (*dir.rbegin() != '/') |
|
|
|
dir += '/'; |
|
|
|
dir += '/'; |
|
|
|
|