[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121012131427-rr9cl2ausnraogfg

1 files changed, 4 insertions, 5 deletions

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 99e1a67f51b..968b1acb0de 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1019,15 +1019,13 @@ instance.web.WebClient = instance.web.Client.extend({
 
         var state = $.bbq.getState(true);
         var action = {
-            'type': 'ir.actions.client',
-            'tag': 'login',
-            'params': state
+            type: 'ir.actions.client',
+            tag: 'login',
+            _push_me: false,
         };
 
         this.action_manager.do_action(action);
         this.action_manager.inner_widget.on('login_successful', this, function() {
-            this.do_push_state(state);
-            this._current_state = null;     // ensure the state will be loaded
             this.show_application();        // will load the state we just pushed
         });
     },
@@ -1103,6 +1101,7 @@ instance.web.WebClient = instance.web.Client.extend({
                     });
                 });
             } else {
+                state._push_me = false;  // no need to push state back...
                 this.action_manager.do_load_state(state, !!this._current_state);
             }
         }