Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KSP-CKAN/CKAN
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9343ddd2643d
Choose a base ref
...
head repository: KSP-CKAN/CKAN
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad78cd40068e
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 3, 2018

  1. Move AutoUpdate.CanUpdate check to InstallUpdateButton_Click 

    Show full `AutoUpdateCheckbox`, even if AutoUpdate isn't avaiable to solve VisualStudio Designer Error.
Instead, check for `AutoUpdate.CanUpdate` on `InstallUpdateButton_Click` and raise error, if false.
    @DasSkelett
    DasSkelett committed Apr 3, 2018
    Copy the full SHA
    c9bf1f8 View commit details

Commits on Apr 12, 2018

  1. Merge #2407 Move AutoUpdate.CanUpdate check

    @politas
    politas committed Apr 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    politas Myk
    GPG key ID: 47938AAEAD85818F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad78cd4 View commit details
Showing with 30 additions and 24 deletions.
  1. +1 −0 CHANGELOG.md
  2. +19 −22 GUI/SettingsDialog.Designer.cs
  3. +10 −2 GUI/SettingsDialog.cs
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
- [Multiple] Clean-up and debuggability (#2399 by: HebaruSan; reviewed: politas)
- [Netkan] Don't double encode GitHub download URLs (#2402 by: HebaruSan; reviewed: politas)
- [Netkan] Option to override SpaceDock version with AVC version (#2406 by: HebaruSan; reviewed: politas)
- [GUI] Move AutoUpdate.CanUpdate check to resolve VisualStudio Designer Error (#2407 by: DasSkellet; reviewed: Olympic1, politas)

### Internal

41 changes: 19 additions & 22 deletions GUI/SettingsDialog.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions GUI/SettingsDialog.cs
View file
Original file line number Diff line number Diff line change
@@ -399,8 +399,16 @@ private void CheckForUpdatesButton_Click(object sender, EventArgs e)

private void InstallUpdateButton_Click(object sender, EventArgs e)
{
Hide();
Main.Instance.UpdateCKAN();
if (AutoUpdate.CanUpdate)
{
Hide();
Main.Instance.UpdateCKAN();
}
else
{
GUI.user.RaiseError("Can't autoupdate. Please check https://github.com/KSP-CKAN/CKAN/ for help!");
}

}

private void CheckUpdateOnLaunchCheckbox_CheckedChanged(object sender, EventArgs e)