From 5c4c66c0873e2b21d87929ab7e3389883c4ee074 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 16 Jan 2018 05:45:52 +0300 Subject: Fix code style. --- src/utils/gettexthelper.cpp | 7 ++----- src/utils/stringutils.cpp | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/utils') 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(("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); } -- cgit v1.2.3-60-g2f50