diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-01-16 05:45:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-01-16 05:45:52 +0300 |
commit | 5c4c66c0873e2b21d87929ab7e3389883c4ee074 (patch) | |
tree | 1c14043c6b4d6089e0f15006f902b4ef8697be26 /src/utils | |
parent | 43abb22c0626529c8465f25bd62b813898abe840 (diff) | |
download | manaverse-5c4c66c0873e2b21d87929ab7e3389883c4ee074.tar.gz manaverse-5c4c66c0873e2b21d87929ab7e3389883c4ee074.tar.bz2 manaverse-5c4c66c0873e2b21d87929ab7e3389883c4ee074.tar.xz manaverse-5c4c66c0873e2b21d87929ab7e3389883c4ee074.zip |
Fix code style.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/gettexthelper.cpp | 7 | ||||
-rw-r--r-- | src/utils/stringutils.cpp | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp index 422c7d36f..9b8f16352 100644 --- a/src/utils/gettexthelper.cpp +++ b/src/utils/gettexthelper.cpp @@ -73,11 +73,8 @@ static std::string setLangEnv() putenv(const_cast<char*>(("LANGUAGE=" + lang).c_str())); #else // WIN32 - if (!lang.empty()) - { - setEnv("LANG", lang.c_str()); - setEnv("LANGUAGE", lang.c_str()); - } + setEnv("LANG", lang.c_str()); + setEnv("LANGUAGE", lang.c_str()); #endif // WIN32 } diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index c91dfd932..6ec7817ed 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -588,7 +588,7 @@ std::string combineDye3(std::string file, } return file.append("|").append(str); } - if (dye.empty() || file.empty()) + if (file.empty()) return file; return file.append("|").append(dye); } |