fixes #468

svn changeset:1023/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index deebaee7c7a6f26f3d97b1a1456d26d5fa0d1fcb..02f2d333e25c07aa50233b4ab04210f394c935bd 100644 (file)
--- 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;