Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed obsolete Java controller warning for non-ASCII path #5512

Merged
merged 2 commits into from
Nov 16, 2022
Merged

Removed obsolete Java controller warning for non-ASCII path #5512

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9845b2d
Removed obsolete Java controller warning for non-ASCII path
omichel Nov 15, 2022
cc68d67
Merge branch 'develop' into fix-obsolete-java-controller-warning
omichel Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/webots/control/WbController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,6 @@ void WbController::start() {
}
mType = findType(mControllerPath);
setProcessEnvironment();
// on Windows, java is unable to find class in a path including UTF-8 characters (e.g., Chinese)
#ifdef _WIN32
if ((mType == WbFileUtil::CLASS || mType == WbFileUtil::JAR) &&
QString(mControllerPath.toUtf8()) != QString::fromLocal8Bit(mControllerPath.toLocal8Bit()))
WbLog::warning(tr("'%1'\nThe path to this Webots project contains non 8-bit characters. "
"Webots won't be able to execute any Java controller in this path. "
"Please move this Webots project into a folder with only 8-bit characters.")
.arg(mControllerPath));
#endif
switch (mType) {
case WbFileUtil::EXECUTABLE:
(name() == "<generic>") ? startGenericExecutable() : startExecutable();
Expand Down