Merge pull request #41 from stramit/crash-fixes

Crash fixes

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphEditWindow.cs

 
         public virtual GraphView CreateGraphView()
         {
-            return new SerializableGraphView();
+            return new SerializableGraphView(this);
         }
 
         void OnEnable()

MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/SerializableGraphView.cs

     // TODO JOCE Maybe bring SimpleGraphView public. This implements pretty much all that it does.
     public class SerializableGraphView : GraphView
     {
-        public SerializableGraphView()
+        private ShortcutHandler m_ShortcutHandler;
+        private EditorWindow m_EditorWindow;
+
+        public SerializableGraphView(EditorWindow editorWindow)
-            // Shortcut handler to delete elements
-            this.AddManipulator(new ShortcutHandler(
+            m_EditorWindow = editorWindow;
+            m_ShortcutHandler = new ShortcutHandler(
                     new Dictionary<Event, ShortcutDelegate>
             {
                 {Event.KeyboardEvent("a"), FrameAll},
                 {Event.KeyboardEvent("#c"), CopySelection},
                 {Event.KeyboardEvent("#v"), Paste},
                 {Event.KeyboardEvent("#d"), DuplicateSelection}
-            }));
+            });
+
+            onEnter += () => m_EditorWindow.rootVisualContainer.parent.AddManipulator(m_ShortcutHandler);
+            onLeave += () => m_EditorWindow.rootVisualContainer.parent.RemoveManipulator(m_ShortcutHandler);
 
             this.AddManipulator(new Commandable
             {

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs

 
         public override GraphView CreateGraphView()
         {
-            return new MaterialGraphView();
+            return new MaterialGraphView(this);
         }
     }
 }

MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphView.cs

 {
     public class MaterialGraphView : SerializableGraphView
     {
-        public MaterialGraphView()
+        public MaterialGraphView(EditorWindow editorWindow) : base(editorWindow)
         {
             RegisterCallback<MouseUpEvent>(DoContextMenu);