[CHANGED] the wording for the check box in the settings menu

[FIXED] bug where unity would freeze if you chose to keep Maya up
[CHANGED] consolidated a lot of logic in the ConfigureMaya function

Author: AJubrey

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -168,7 +168,7 @@ public override void OnInspectorGUI() {
             }
 
             exportSettings.launchAfterInstallation = EditorGUILayout.Toggle(
-                new GUIContent("Launch program after installation:",
+                new GUIContent("Launch 3D Application:",
                     "Launch the selected application after unity integration is completed."),
                 exportSettings.launchAfterInstallation
             );

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -140,9 +140,7 @@ private static string MAYA_CONFIG_COMMAND { get {
         }}
 
         private static string MAYA_CLOSE_COMMAND { get {
-                return string.Format("scriptJob -idleEvent quit;",
-                    ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(),
-                    GetExportSettingsPath(), GetMayaInstructionPath(), (IsHeadlessInstall()?1:0));
+                return string.Format("scriptJob -idleEvent quit;");
         }}
         private static Char[] FIELD_SEPARATORS = new Char[] {':'};
 
@@ -329,41 +327,44 @@ public static int ConfigureMaya(string mayaPath)
                 myProcess.StartInfo.CreateNoWindow = true;
                 myProcess.StartInfo.UseShellExecute = false;
 
+                string commandString;
+
                 switch (Application.platform) {
                 case RuntimePlatform.WindowsEditor:
-                    if (EditorTools.ExportSettings.instance.launchAfterInstallation)
-                    {
-                        myProcess.StartInfo.Arguments = string.Format("-command \"{0}\"", MAYA_CONFIG_COMMAND);
-                        myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
-                        myProcess.StartInfo.CreateNoWindow = false;
-                    }
-                    else
-                    {
-                        myProcess.StartInfo.Arguments = string.Format("-command \"{0}\"", MAYA_CONFIG_COMMAND + MAYA_CLOSE_COMMAND);
-                    }                    
+                    commandString = "-command \"{0}\"";
                     break;
                 case RuntimePlatform.OSXEditor:
-                    if (EditorTools.ExportSettings.instance.launchAfterInstallation)
-                    {
-                        myProcess.StartInfo.Arguments = string.Format(@"-command '{0}'", MAYA_CONFIG_COMMAND);
-                        myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
-                        myProcess.StartInfo.CreateNoWindow = false;
-                        }
-                    else
-                    {
-                        myProcess.StartInfo.Arguments = string.Format(@"-command '{0}'", MAYA_CONFIG_COMMAND + MAYA_CLOSE_COMMAND);
-                    }                    
+                    commandString = @"-command '{0}'";
                     break;
                 default:
                     throw new NotImplementedException ();
                 }
 
+                if (EditorTools.ExportSettings.instance.launchAfterInstallation)
+                {
+                    myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
+                    myProcess.StartInfo.CreateNoWindow = false;
+                    myProcess.StartInfo.Arguments = string.Format(commandString, MAYA_CONFIG_COMMAND);
+                }
+                else
+                {
+                    myProcess.StartInfo.Arguments = string.Format(commandString, MAYA_CONFIG_COMMAND + MAYA_CLOSE_COMMAND);
+                }
+
                 myProcess.EnableRaisingEvents = true;
                 myProcess.Start();
-                myProcess.WaitForExit();
-                ExitCode = myProcess.ExitCode;
-                Debug.Log(string.Format("Ran maya: [{0}]\nWith args [{1}]\nResult {2}",
-                            mayaPath, myProcess.StartInfo.Arguments, ExitCode));
+
+                if (!EditorTools.ExportSettings.instance.launchAfterInstallation)
+                {
+                    myProcess.WaitForExit();
+                    ExitCode = myProcess.ExitCode;
+                    Debug.Log(string.Format("Ran maya: [{0}]\nWith args [{1}]\nResult {2}",
+                                mayaPath, myProcess.StartInfo.Arguments, ExitCode));
+                }
+                else
+                {
+                    ExitCode = 0;
+                }
             }
              catch (Exception e)
              {