Fix GUI instance name checking #2316

HebaruSan · 2018-02-25T17:25:43Z

Problem

If you try to add a new game instance in GUI that has the same folder name as an existing instance, you get this exception:

This worked fine on previous versions.

Cause

In #2239, this function:

CKAN/GUI/ChooseKSPInstance.cs

Lines 73 to 80 in 2cc20b5

    
           try 
        
           { 
        
               KSP instance = new KSP(path, GUI.user);                 
        
               var instanceName = Path.GetFileName(path); 
        
               instanceName = _manager.GetNextValidInstanceName(instanceName); 
        
               _manager.AddInstance(instanceName, instance); 
        
               UpdateInstancesList(); 
        
           }

was changed to pass the name of the instance to the constructor of KSP instead of AddInstance, because instances now know their own names. However, the GetNextValidInstanceName call ended up in the wrong place; it should be before we use the name, but it's after:

CKAN/GUI/ChooseKSPInstance.cs

Lines 73 to 80 in c1d33f8

    
           try 
        
           { 
        
               var instanceName = Path.GetFileName(path); 
        
               KSP instance = new KSP(path, instanceName, GUI.user); 
        
               instanceName = _manager.GetNextValidInstanceName(instanceName); 
        
               _manager.AddInstance(instance); 
        
               UpdateInstancesList(); 
        
           }

Changes

Now GetNextValidInstanceName is called before the instance is created.

Fixes #2315.

Fix GUI instance name checking

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

26056e8

HebaruSan added Bug GUI Pull request labels Feb 25, 2018

politas merged commit 26056e8 into KSP-CKAN:master Feb 25, 2018

politas added a commit that referenced this pull request Feb 25, 2018

Merge #2316 Fix GUI instance name checking

86bf144

politas removed Bug Pull request labels Feb 25, 2018

HebaruSan deleted the fix/gui-add-instance-name branch February 25, 2018 18:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix GUI instance name checking #2316

Fix GUI instance name checking #2316

HebaruSan commented Feb 25, 2018

	try
	{
	KSP instance = new KSP(path, GUI.user);
	var instanceName = Path.GetFileName(path);
	instanceName = _manager.GetNextValidInstanceName(instanceName);
	_manager.AddInstance(instanceName, instance);
	UpdateInstancesList();
	}

	try
	{
	var instanceName = Path.GetFileName(path);
	KSP instance = new KSP(path, instanceName, GUI.user);
	instanceName = _manager.GetNextValidInstanceName(instanceName);
	_manager.AddInstance(instance);
	UpdateInstancesList();
	}

Fix GUI instance name checking #2316

Fix GUI instance name checking #2316

Conversation

HebaruSan commented Feb 25, 2018

Problem

Cause

Changes