Fix issue proxb#211

MVKozlov · Sep 2, 2020 · 5f063d4 · 5f063d4
1 parent b37589a
commit 5f063d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/PoshRSJob/PoshRSJob.psd1 b/PoshRSJob/PoshRSJob.psd1
@@ -55,7 +55,7 @@ Description = 'Module designed to use PowerShell runspaces to create jobs that a
 #RequiredAssemblies = @()
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module
-ScriptsToProcess = @('Scripts\TabExpansion.ps1')
+#ScriptsToProcess = @('Scripts\TabExpansion.ps1')
 
 # Type files (.ps1xml) to be loaded when importing this module
 #TypesToProcess = 'TypeData\PoshRSJob.Types.ps1xml'

diff --git a/PoshRSJob/PoshRSJob.psm1 b/PoshRSJob/PoshRSJob.psm1
@@ -302,8 +302,17 @@ New-Alias -Name spsj -Value Stop-RSJob -Force
 New-Alias -Name wsj -Value Wait-RSJob -Force
 #endregion Aliases
 
+#region TabExpansion
+$oldTabExpansion2 = $function:TabExpansion2
+. "$ScriptPath/Scripts/TabExpansion.ps1"
+#endregion TabExpansion
+
 #region Handle Module Removal
 $PoshRS_OnRemoveScript = {
+    if ($null -ne $oldTabExpansion2)
+    {
+        Set-Item function:\TabExpansion2 $oldTabExpansion2
+    }
     $PoshRS_jobCleanup.Flag=$False
     $PoshRS_RunspacePoolCleanup.Flag=$False
     #Let sit for a second to make sure it has had time to stop