Skip to content

Commit 32afd35

Browse files
danttiTheAssassin
andauthored
Update src/main.cpp
Co-authored-by: TheAssassin <[email protected]>
1 parent 3f5c1fb commit 32afd35

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/main.cpp

+11-6
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,18 @@ int main(const int argc, const char *const *const argv) {
202202
std::vector<std::string> extraModulesFromEnv;
203203
const auto* const extraModulesFromEnvData = []() {
204204
auto* ret = getenv("EXTRA_QT_MODULES");
205-
if (ret == nullptr) {
206-
ret = getenv("EXTRA_QT_PLUGINS");
207-
if (ret) {
208-
ldLog() << std::endl << LD_WARNING << "Using deprecated EXTRA_QT_PLUGINS env var" << std::endl;
209-
}
205+
206+
if (ret != nullptr) {
207+
return ret;
208+
}
209+
210+
ret = getenv("EXTRA_QT_PLUGINS");
211+
if (ret != nullptr) {
212+
ldLog() << std::endl << LD_WARNING << "Using deprecated EXTRA_QT_PLUGINS env var" << std::endl;
213+
return ret;
210214
}
211-
return ret;
215+
216+
return nullptr;
212217
}();
213218
if (extraModulesFromEnvData != nullptr)
214219
extraModulesFromEnv = linuxdeploy::util::split(std::string(extraModulesFromEnvData), ';');

0 commit comments

Comments
 (0)