Reverting bug introduced in #4071 (#4101)

vincentpierre · web-flow · commit 9ec2fe26e954 · 2020-06-09T14:42:05.000-07:00
diff --git a/com.unity.ml-agents/Runtime/Academy.cs b/com.unity.ml-agents/Runtime/Academy.cs
@@ -366,8 +366,6 @@ void InitializeEnvironment()
                         port = port
                     }
                 );
-                Communicator.QuitCommandReceived += OnQuitCommandReceived;
-                Communicator.ResetCommandReceived += OnResetCommand;
             }
 
             if (Communicator != null)
@@ -400,6 +398,11 @@ void InitializeEnvironment()
                     Communicator = null;
                 }
             }
+            if (Communicator != null)
+            {
+                Communicator.QuitCommandReceived += OnQuitCommandReceived;
+                Communicator.ResetCommandReceived += OnResetCommand;
+            }
 
             // If a communicator is enabled/provided, then we assume we are in
             // training mode. In the absence of a communicator, we assume we are

Original file line number	Diff line number	Diff line change
`@@ -366,8 +366,6 @@ void InitializeEnvironment()`
`366`	`366`	`port = port`
`367`	`367`	`}`
`368`	`368`	`);`
`369`		`- Communicator.QuitCommandReceived += OnQuitCommandReceived;`
`370`		`- Communicator.ResetCommandReceived += OnResetCommand;`
`371`	`369`	`}`
`372`	`370`
`373`	`371`	`if (Communicator != null)`
`@@ -400,6 +398,11 @@ void InitializeEnvironment()`
`400`	`398`	`Communicator = null;`
`401`	`399`	`}`
`402`	`400`	`}`
	`401`	`+ if (Communicator != null)`
	`402`	`+ {`
	`403`	`+ Communicator.QuitCommandReceived += OnQuitCommandReceived;`
	`404`	`+ Communicator.ResetCommandReceived += OnResetCommand;`
	`405`	`+ }`
`403`	`406`
`404`	`407`	`// If a communicator is enabled/provided, then we assume we are in`
`405`	`408`	`// training mode. In the absence of a communicator, we assume we are`