Merge branch 'development'

IridiumIO · Oct 16, 2017 · 83bcda9 · 83bcda9
2 parents f8bbe8f + 73f702c
commit 83bcda9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/WindowsApp1/Compact.Designer.vb b/WindowsApp1/Compact.Designer.vb
diff --git a/WindowsApp1/Compact.vb b/WindowsApp1/Compact.vb
@@ -5,7 +5,7 @@ Imports System.Text.RegularExpressions
 Imports Ookii.Dialogs                                                                          'Uses Ookii Dialogs for the non-archaic filebrowser dialog. http://www.ookii.org/Software/Dialogs
 
 Public Class Compact
-    Dim version = "1.3.4"
+    Dim version = "1.3.5"
     Private WithEvents MyProcess As Process
     Private Delegate Sub AppendOutputTextDelegate(ByVal text As String)
 
@@ -53,7 +53,7 @@ Public Class Compact
 
         Try
 
-        If e.Data.Contains("total bytes of data are stored in") Then                        'Gets the output line that contains both the pre- and post-compression folder sizes
+            If e.Data.Contains("total bytes of data are stored in") Then                        'Gets the output line that contains both the pre- and post-compression folder sizes
                 byteComparisonRaw = e.Data
             End If
 
@@ -361,12 +361,14 @@ Public Class Compact
 
             Try
 
-                MyProcess.StandardInput.WriteLine("cd /d " + workingDir)
+                MyProcess.StandardInput.WriteLine("cd " + workingDir)
                 MyProcess.StandardInput.Flush()
 
                 MyProcess.StandardInput.WriteLine("")                                           'Required for the embedded console to show the next line in the buffer after the 'cd' command. No idea why
                 MyProcess.StandardInput.Flush()
 
+                MyProcess.StandardInput.WriteLine("chcp 437")
+                MyProcess.StandardInput.Flush()
 
                 RunCompact(passthrougharg)
 

diff --git a/WindowsApp1/My Project/AssemblyInfo.vb b/WindowsApp1/My Project/AssemblyInfo.vb
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.3.4.0")>
-<Assembly: AssemblyFileVersion("1.3.4.0")>
+<Assembly: AssemblyVersion("1.3.5.0")>
+<Assembly: AssemblyFileVersion("1.3.5.0")>
 <Assembly: NeutralResourcesLanguage("en")>