aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/web/ApplicationServlet.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index deebaee7c7..02f2d333e2 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -570,8 +570,12 @@ public class ApplicationServlet extends HttpServlet implements
// try to detect it
WebBrowser wb = WebBrowserProbe.getTerminalType(request
.getSession());
- if ("detect".equals(unhandledParameters.get("renderingMode"))
- || wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) {
+
+ boolean detect = false;
+ if (unhandledParameters.get("renderingMode") != null) {
+ detect = ((String) ( (Object[]) unhandledParameters.get("renderingMode"))[0]).equals("detect");
+ }
+ if (detect || wb.getRenderingMode() == WebBrowser.RENDERING_MODE_UNDEFINED) {
String themeName = application.getTheme();
if (themeName == null)
themeName = DEFAULT_THEME;