Merge #3332 Tell user if instance addition fails

KSP-CKAN · Mar 29, 2021 · d724787 · d724787
2 parents 7849cf9 + 1d0f8bc
commit d724787
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 - [GUI] Handle renamed modlist columns in sort list gracefully (#3319 by: DasSkelett; reviewed: HebaruSan)
 - [Core] Fix AD mod upgrading, add tests, and fix all warnings (#3315 by: HebaruSan; reviewed: DasSkelett)
 - [Core] Reset cache dir to default if creation fails (#3334 by: HebaruSan; reviewed: DasSkelett)
+- [GUI] Tell user if instance addition fails (#3332 by: HebaruSan; reviewed: DasSkelett)
 
 ### Internal
 

diff --git a/Core/Net/Repo.cs b/Core/Net/Repo.cs
@@ -381,7 +381,7 @@ private static List<CkanModule> UpdateRegistryFromTarGz(string path, out SortedD
                 using (GZipInputStream gzipStream = new GZipInputStream(inputStream))
                 {
                     // Create a handle for the tar stream.
-                    using (TarInputStream tarStream = new TarInputStream(gzipStream))
+                    using (TarInputStream tarStream = new TarInputStream(gzipStream, Encoding.UTF8))
                     {
                         TarEntry entry;
                         while ((entry = tarStream.GetNextEntry()) != null)

diff --git a/GUI/Dialogs/ManageGameInstancesDialog.cs b/GUI/Dialogs/ManageGameInstancesDialog.cs
@@ -108,7 +108,10 @@ private void AddToCKANMenuItem_Click(object sender, EventArgs e)
             {
                 _user.RaiseError(Properties.Resources.ManageGameInstancesNotValid,
                     new object[] { k.path });
-                return;
+            }
+            catch (Exception exc)
+            {
+                _user.RaiseError(exc.Message);
             }
         }
 

diff --git a/Netkan/Validators/VrefValidator.cs b/Netkan/Validators/VrefValidator.cs
@@ -59,7 +59,7 @@ public void Validate(Metadata metadata)
                         // This means the install stanzas don't match any files.
                         // That's not our problem; someone else will report it.
                     }
-                    catch (Kraken k)
+                    catch (Kraken)
                     {
                         // If FindInternalAvc throws anything else, then there's a version file with a syntax error.
                         // This shouldn't cause the inflation to fail, but it does deprive us of the path.