Supporting spaces in Minecraft Game Directory closes #74

Some Bugfixes
JBou · Sep 28, 2014 · 8802cfc · 8802cfc
1 parent 50dd754
commit 8802cfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/MinecraftLauncher/Application.xaml.vb b/MinecraftLauncher/Application.xaml.vb
@@ -23,6 +23,7 @@ Class Application
 
     Private Sub Application_DispatcherUnhandledException(sender As Object, e As Windows.Threading.DispatcherUnhandledExceptionEventArgs) Handles Me.DispatcherUnhandledException
         e.Handled = True
+        OnExceptionOccurred(e.Exception)
     End Sub
 
     Private Sub OnExceptionOccurred(ex As Exception)

diff --git a/MinecraftLauncher/Windows/MainWindow.xaml.vb b/MinecraftLauncher/Windows/MainWindow.xaml.vb
@@ -864,9 +864,9 @@ Public Class MainWindow
                                       End If
                                       argumentreplacements.Add(New String() {"${auth_player_name}", Startinfos.Session.SelectedProfile.Name})
                                       argumentreplacements.Add(New String() {"${version_name}", Startinfos.Version.id})
-                                      argumentreplacements.Add(New String() {"${game_directory}", gamedir})
-                                      argumentreplacements.Add(New String() {"${game_assets}", assets_dir})
-                                      argumentreplacements.Add(New String() {"${assets_root}", assets_dir})
+                                      argumentreplacements.Add(New String() {"${game_directory}", """" & gamedir & """"})
+                                      argumentreplacements.Add(New String() {"${game_assets}", """" & assets_dir & """"})
+                                      argumentreplacements.Add(New String() {"${assets_root}", """" & assets_dir & """"})
                                       argumentreplacements.Add(New String() {"${assets_index_name}", assets_index_name})
                                       argumentreplacements.Add(New String() {"${user_properties}", New JObject().ToString})
 
@@ -977,7 +977,7 @@ Public Class MainWindow
 
     Public Async Sub StartMC()
         If Startinfos.IsStarting = True Then
-            Await Me.ShowMessageAsync(Application.Current.FindResource("Atention").ToString, Application.Current.FindResource("MinecraftAlreadyStarting").ToString & "!", MessageDialogStyle.Affirmative, New MetroDialogSettings() With {.AffirmativeButtonText = Application.Current.FindResource("OK").ToString, .ColorScheme = MetroDialogColorScheme.Accented})
+            Await Me.ShowMessageAsync(Application.Current.FindResource("Attention").ToString, Application.Current.FindResource("MinecraftAlreadyStarting").ToString & "!", MessageDialogStyle.Affirmative, New MetroDialogSettings() With {.AffirmativeButtonText = Application.Current.FindResource("OK").ToString, .ColorScheme = MetroDialogColorScheme.Accented})
         ElseIf cb_profiles.SelectedIndex = -1 Then
             Await Me.ShowMessageAsync(Nothing, Application.Current.FindResource("PleaseSelectProfile").ToString & "!", MessageDialogStyle.Affirmative, New MetroDialogSettings() With {.AffirmativeButtonText = Application.Current.FindResource("OK").ToString, .ColorScheme = MetroDialogColorScheme.Accented})
             'ElseIf tb_username.Text = Nothing Then
@@ -1255,9 +1255,9 @@ Public Class MainWindow
             'End If
             Select Case selected.type
                 Case "forge"
-                    lbl_type.Content = String.Format("{0}: {1} ({2}->{1})", Application.Current.FindResource("Prerequisite").ToString, Application.Current.FindResource("LiteLoader").ToString, Application.Current.FindResource("Tools").ToString)
-                Case "liteloader"
                     lbl_type.Content = String.Format("{0}: {1} ({2}->{1})", Application.Current.FindResource("Prerequisite").ToString, Application.Current.FindResource("MinecraftForge").ToString, Application.Current.FindResource("Tools").ToString)
+                Case "liteloader"
+                    lbl_type.Content = String.Format("{0}: {1} ({2}->{1})", Application.Current.FindResource("Prerequisite").ToString, Application.Current.FindResource("LiteLoader").ToString, Application.Current.FindResource("Tools").ToString)
                 Case Else
                     lbl_type.Content = Application.Current.FindResource("Typ").ToString & ": " & DirectCast(lb_mods.SelectedItem, Modifications.Mod).type
             End Select