Bug 340023 - [ModelTooling] Infinite SWT error dialog after closing a part with the live editor dialog up

1 files changed, 3 insertions, 3 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.liveeditor/src/org/eclipse/e4/tools/emf/liveeditor/OpenLiveDialogHandler.java b/bundles/org.eclipse.e4.tools.emf.liveeditor/src/org/eclipse/e4/tools/emf/liveeditor/OpenLiveDialogHandler.java
index 06b459be..b78af4ec 100644
--- a/bundles/org.eclipse.e4.tools.emf.liveeditor/src/org/eclipse/e4/tools/emf/liveeditor/OpenLiveDialogHandler.java
+++ b/bundles/org.eclipse.e4.tools.emf.liveeditor/src/org/eclipse/e4/tools/emf/liveeditor/OpenLiveDialogHandler.java
@@ -33,8 +33,7 @@ public class OpenLiveDialogHandler {
 	}
 
 	@Execute
-	public void run(@Named(IServiceConstants.ACTIVE_SHELL) Shell s,
-			IEclipseContext c, MApplication application, IStylingEngine engine) {
+	public void run(@Named(IServiceConstants.ACTIVE_SHELL) Shell s, MApplication application, IStylingEngine engine) {
 		if (this.shell == null || this.shell.isDisposed()) {
 			try {
 				this.shell = new Shell(s,SWT.SHELL_TRIM);
@@ -45,7 +44,8 @@ public class OpenLiveDialogHandler {
 				layout.marginHeight=10;
 				layout.marginWidth=10;
 				this.shell.setLayout(layout);
-				final IEclipseContext childContext = c
+				
+				final IEclipseContext childContext = application.getContext()
 						.createChild("EditorContext");
 				MemoryModelResource resource = new MemoryModelResource(application);
 				childContext.set(IModelResource.class, resource);