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: abc4e1962a7f
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: f98b9f0e89d0
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 20, 2018

  1. Fix accessing TransparentTextBox after disposing 

    On form close, all controls are set to invisible, but TransparentTextBoxes are already disposed.
This commit blocks the method if the the tab control is already disposed.
    @DasSkelett
    DasSkelett committed Dec 20, 2018
    Copy the full SHA
    48dfd3a View commit details

Commits on Dec 30, 2018

  1. Merge #2619 Fix System.ObjectDisposedException for TransparentTextBox

    @politas
    politas committed Dec 30, 2018
    Copy the full SHA
    f98b9f0 View commit details
Showing with 9 additions and 1 deletion.
  1. +1 −0 CHANGELOG.md
  2. +1 −1 GUI/Main.cs
  3. +7 −0 GUI/MainModList.cs
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file.
- [Multiple] Encapsulate usages of WebClient (#2614 by: HebaruSan; reviewed: politas)
- [Netkan] Handle multiple game versions from Curse (#2616 by: HebaruSan; reviewed: politas)
- [GUI] Fix UpdateModsList crash on Mono (#2625 by: HebaruSan; reviewed: politas)
- [GUI] Fix System.ObjectDisposedException for TransparentTextBox (#2619 by: DasSkelett; reviewed: HebaruSan)

## v1.25.4 Kennedy

2 changes: 1 addition & 1 deletion GUI/Main.cs
View file
Original file line number Diff line number Diff line change
@@ -247,7 +247,7 @@ public Main(string[] cmdlineArgs, KSPManager mgr, GUIUser user, bool showConsole
if (!showConsole)
Util.HideConsoleWindow();

// Disable the modinfo controls until a mod has been choosen.
// Disable the modinfo controls until a mod has been choosen. This has an effect if the modlist is empty.
ActiveModInfo = null;

// WinForms on Mac OS X has a nasty bug where the UI thread hogs the CPU,
7 changes: 7 additions & 0 deletions GUI/MainModList.cs
View file
Original file line number Diff line number Diff line change
@@ -294,6 +294,13 @@ public void _MarkModForUpdate(string identifier)

private void ModList_SelectedIndexChanged(object sender, EventArgs e)
{
// Skip if already disposed (i.e. after the form has been closed).
// Needed for TransparentTextBoxes
if (ModInfoTabControl.IsDisposed)
{
return;
}

var module = GetSelectedModule();

ActiveModInfo = module;