safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.1.0 changes bcak to master.

Browse Source
This commit is contained in:
Virtually Nick
2019-06-08 17:34:11 -04:00
parent 4df22ce67b 203c4d9b58
commit ee6a79933e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
View File

@@ -167,9 +167,9 @@ public class TunnelRequestService {
if (imageMimetypes != null) if (imageMimetypes != null)
info.getImageMimetypes().addAll(imageMimetypes); info.getImageMimetypes().addAll(imageMimetypes);
// Get the timezone value // Set timezone if provided
String timezone = request.getTimezone(); String timezone = request.getTimezone();
if (timezone != null & !timezone.isEmpty()) if (timezone != null && !timezone.isEmpty())
info.setTimezone(timezone); info.setTimezone(timezone);
return info; return info;