From 76d04b6e49e44854081e42baafefea1062c724da Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Thu, 10 Nov 2011 01:24:38 +0000 Subject: [PATCH] SDK: - fix scene closing when opening file while scene is already used git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8628 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../src/com/jme3/gde/core/scene/SceneApplication.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java index ae231b5cd..2dbb782b2 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/scene/SceneApplication.java @@ -399,6 +399,7 @@ public class SceneApplication extends Application implements LookupProvider { if (oldRequest == null) { return; } + notifyClose(oldRequest); if (newRequest == null || newRequest.getRootNode() != oldRequest.getRootNode()) { checkSave(oldRequest); SceneUndoRedoManager manager = Lookup.getDefault().lookup(SceneUndoRedoManager.class); @@ -406,10 +407,11 @@ public class SceneApplication extends Application implements LookupProvider { manager.discardAllEdits(); } } - setCurrentFileNode(null); - setWindowTitle("OpenGL Window"); - setHelpContext(null); - notifyClose(oldRequest); + if (newRequest == null) { + setCurrentFileNode(null); + setWindowTitle("OpenGL Window"); + setHelpContext(null); + } enqueue(new Callable() { public Object call() throws Exception {