diff --git a/GUI/Main/MainChangeset.cs b/GUI/Main/MainChangeset.cs index ce2c051782..ff5ba1012b 100644 --- a/GUI/Main/MainChangeset.cs +++ b/GUI/Main/MainChangeset.cs @@ -31,7 +31,7 @@ private void Changeset_OnConfirmChanges() { menuStrip1.Enabled = false; - //Using the changeset passed in can cause issues with versions. + // Using the changeset passed in can cause issues with versions. // An example is Mechjeb for FAR at 25/06/2015 with a 1.0.2 install. // TODO Work out why this is. installWorker.RunWorkerAsync( diff --git a/GUI/Main/MainInstall.cs b/GUI/Main/MainInstall.cs index 0bd68005f4..e26e4b6534 100644 --- a/GUI/Main/MainInstall.cs +++ b/GUI/Main/MainInstall.cs @@ -12,8 +12,8 @@ public partial class Main { private BackgroundWorker installWorker; - // used to signal the install worker that the user canceled the install process - // this may happen on the recommended/suggested mods dialogs + // Used to signal the install worker that the user canceled the install process. + // This may happen on the recommended/suggested mods dialogs or during the download. private volatile bool installCanceled; /// @@ -417,9 +417,19 @@ private void PostInstallMods(object sender, RunWorkerCompletedEventArgs e) ); } } + else if (e.Error == null) + { + // The install was unsuccessful, but we did catch the exception. + FailWaitDialog( + Properties.Resources.MainInstallErrorInstalling, + Properties.Resources.MainInstallKnownError, + Properties.Resources.MainInstallFailed, + result.Key + ); + } else { - // There was an error + // An unknown error was thrown which we didn't catch. FailWaitDialog( Properties.Resources.MainInstallErrorInstalling, Properties.Resources.MainInstallUnknownError, diff --git a/GUI/Properties/Resources.Designer.cs b/GUI/Properties/Resources.Designer.cs index 0dbfa9288f..09518e50ac 100644 --- a/GUI/Properties/Resources.Designer.cs +++ b/GUI/Properties/Resources.Designer.cs @@ -530,6 +530,9 @@ internal static string MainInstallErrorInstalling { internal static string MainInstallUnknownError { get { return (string)(ResourceManager.GetObject("MainInstallUnknownError", resourceCulture)); } } + internal static string MainInstallKnownError { + get { return (string)(ResourceManager.GetObject("MainInstallKnownError", resourceCulture)); } + } internal static string MainInstallFailed { get { return (string)(ResourceManager.GetObject("MainInstallFailed", resourceCulture)); } } diff --git a/GUI/Properties/Resources.de-DE.resx b/GUI/Properties/Resources.de-DE.resx index 28b64ea2f2..e06460fefa 100644 --- a/GUI/Properties/Resources.de-DE.resx +++ b/GUI/Properties/Resources.de-DE.resx @@ -244,6 +244,9 @@ Einstellungen jetzt öffnen? (De-)Installation/Aktualisierung abgebrochen! Fehler bei der Installation! Ein unbekannter Fehler ist aufgetreten, bitte versuche es erneut! + Falls die Fehlermeldung ein Download-Problem andeutet, versuche es bitte erneut. Andernfalls melde bitte den Fehler bei uns. +Wenn du ein Fehler mit den Mod-Metadaten vermutest: https://github.com/KSP-CKAN/NetKAN/new/choose +Wenn du ein Fehler mit dem CKAN Client vermutest: https://github.com/KSP-CKAN/CKAN/new/choose Installation fehlgeschlagen! Modul {0} wird von mehr als einem verfügbaren Modul bereitgestellt, bitte wähle eine der folgenden Mods: {0} (virtuell) diff --git a/GUI/Properties/Resources.resx b/GUI/Properties/Resources.resx index 5ef21e2d33..174a601242 100644 --- a/GUI/Properties/Resources.resx +++ b/GUI/Properties/Resources.resx @@ -264,6 +264,9 @@ Open settings now? (Un)Install/Upgrade canceled! Error during installation! An unknown error occurred, please try again! + If the above message indicates a download error, please try again. Otherwise, please open a issue for us to investigate. +If you suspect a metadata problem: https://github.com/KSP-CKAN/NetKAN/issues/new/choose +If you suspect a bug in the client: https://github.com/KSP-CKAN/CKAN/issues/new/choose Installation failed! Module {0} is provided by more than one available module, please choose one of the following mods: N/A