- 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
This commit is contained in:
nor..67 2011-11-10 01:24:38 +00:00
parent b43b9efe18
commit 76d04b6e49

View File

@ -399,6 +399,7 @@ public class SceneApplication extends Application implements LookupProvider {
if (oldRequest == null) { if (oldRequest == null) {
return; return;
} }
notifyClose(oldRequest);
if (newRequest == null || newRequest.getRootNode() != oldRequest.getRootNode()) { if (newRequest == null || newRequest.getRootNode() != oldRequest.getRootNode()) {
checkSave(oldRequest); checkSave(oldRequest);
SceneUndoRedoManager manager = Lookup.getDefault().lookup(SceneUndoRedoManager.class); SceneUndoRedoManager manager = Lookup.getDefault().lookup(SceneUndoRedoManager.class);
@ -406,10 +407,11 @@ public class SceneApplication extends Application implements LookupProvider {
manager.discardAllEdits(); manager.discardAllEdits();
} }
} }
if (newRequest == null) {
setCurrentFileNode(null); setCurrentFileNode(null);
setWindowTitle("OpenGL Window"); setWindowTitle("OpenGL Window");
setHelpContext(null); setHelpContext(null);
notifyClose(oldRequest); }
enqueue(new Callable() { enqueue(new Callable() {
public Object call() throws Exception { public Object call() throws Exception {