diff options
| -rw-r--r-- | server/src/main/java/com/vaadin/navigator/Navigator.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/server/src/main/java/com/vaadin/navigator/Navigator.java b/server/src/main/java/com/vaadin/navigator/Navigator.java index 83f1dbe739..567c271211 100644 --- a/server/src/main/java/com/vaadin/navigator/Navigator.java +++ b/server/src/main/java/com/vaadin/navigator/Navigator.java @@ -510,6 +510,10 @@ public class Navigator implements Serializable { if (stateManager == null) { stateManager = new UriFragmentManager(ui.getPage()); } + if (stateManager != null && this.stateManager != null + && stateManager != this.stateManager) { + this.stateManager.setNavigator(null); + } this.stateManager = stateManager; this.stateManager.setNavigator(this); this.display = display; |