Commit 4698a3f

committed

Making the Conflict Check work on KSP < 1.8 too.

1 parent eba9b1f commit 4698a3fCopy full SHA for 4698a3f

File tree

1 file changed

+21

-3

lines changed

Source/ModuleManagerWatchDog
- InstallChecker.cs

1 file changed

+21

-3

lines changed

`‎Source/ModuleManagerWatchDog/InstallChecker.cs‎`

Lines changed: 21 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,10 @@ internal void Execute()`
`36`	`36`
`37`	`37`	`if (null == msg)`
`38`	`38`	`{`
`39`		`- msg = this.CheckModuleManagerConflict112();`
	`39`	`+ int version = Versioning.version_major*100 + Versioning.version_minor;;`
	`40`	`+ msg = version >= 108 ? this.CheckModuleManagerConflict108()`
	`41`	`+ : this.CheckModuleManagerConflict()`
	`42`	`+ ;`
`40`	`43`	`if (null != msg && !Globals.Instance.IsValid)`
`41`	`44`	`{`
`42`	`45`	`KSPe.UI.OptionDialogBox.Option[] options = new KSPe.UI.OptionDialogBox.Option[]`
`@@ -164,11 +167,26 @@ private string CheckModuleManagerDoppelganger18()`
`164`	`167`	`private static readonly string GAMEDATAMMDLL = SIO.Path.Combine("GameData", MYFORK_FILENAME);`
`165`	`168`	`static readonly string DASHMMDLL = GAMEDATAMMDLL.Replace("GameData", "");`
`166`	`169`	`static readonly string FULLMMPATH = SIO.Path.Combine(GAMEDATA, MYFORK_FILENAME);`
`167`		`- private string CheckModuleManagerConflict112()`
	`170`	`+`
	`171`	`+ private string CheckModuleManagerConflict()`
	`172`	`+ {`
	`173`	`+ IEnumerable<System.Reflection.Assembly> loaded = SanityLib.FetchAssembliesByName(ASSEMBLY_NAME);`
	`174`	`+#if DEBUG`
	`175`	`+ Log.dbg("CheckModuleManagerConflict");`
	`176`	`+ foreach (System.Reflection.Assembly a in loaded)`
	`177`	`+ Log.dbg("{0} :: {1}", a.FullName, a.Location);`
	`178`	`+#endif`
	`179`	`+ if (loaded.Count() > 1)`
	`180`	`+ foreach(System.Reflection.Assembly asm in loaded) if (this.IsMyFork(new SIO.FileInfo(asm.Location)))`
	`181`	`+ return ErrorMessage.Conflict.ERR_MSG;`
	`182`	`+ return null;`
	`183`	`+ }`
	`184`	`+`
	`185`	`+ private string CheckModuleManagerConflict108()`
`168`	`186`	`{`
`169`	`187`	`IEnumerable<System.Reflection.Assembly> loaded = SanityLib.FetchAssembliesByName(ASSEMBLY_NAME);`
`170`	`188`	`#if DEBUG`
`171`		`- Log.dbg("CheckModuleManager112");`
	`189`	`+ Log.dbg("CheckModuleManagerConflict108");`
`172`	`190`	`foreach (System.Reflection.Assembly a in loaded)`
`173`	`191`	`Log.dbg("{0} :: {1}", a.FullName, a.Location);`
`174`	`192`	`#endif`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 4698a3f

File tree

1 file changed

1 file changed

`‎Source/ModuleManagerWatchDog/InstallChecker.cs‎`

0 commit comments