Diffusion 0 A.D. Public Repository rP25475

Fix mistake in rP25474 which stopped the incompatible mods page from showing.
AuditedrP25475
Actions

Description

Fix mistake in rP25474 which stopped the incompatible mods page from showing.

I didn't quite understand what was supposed to happen here. This makes things work as before.
While at it, fix a conversion bug & do some more tweaks.

Differential Revision: https://code.wildfiregames.com/D3990

Details

Auditors

Silier

Committed

wraitii

May 20 2021, 7:11 PM

Differential Revision

D3990: Fix mistake in rP25474 which stopped the incompatible mods page from showing.

Parents

rP25474: Mod and mod-mounting cleanup and improvements.

Branches

Unknown

Tags

Unknown

Build Status

Buildable 17365
Build 40144: Trigger Windows Autobuild
Build 40143: Post-Commit Build	Jenkins
Build 40142: Post-Commit Build (macOS)	Jenkins

Event Timeline

wraitii mentioned this in rP25474: Mod and mod-mounting cleanup and improvements..May 20 2021, 7:11 PM

wraitii committed rP25475: Fix mistake in rP25474 which stopped the incompatible mods page from showing..May 20 2021, 7:11 PM

wraitii added an edge: D3990: Fix mistake in rP25474 which stopped the incompatible mods page from showing..

There was difference between incompatible mods and failed mods.
Incompatible mods was list of mods which were marked as incompatible mainly for non visual start to report them into logs.

Failed mods was list of all mods which user tried to enable, so in case of visual with gui, user would see in enabled section all mods which have been set in command or in config file.
So there was no issue with filter default (another diff but since i am writing here)

Point was, remove invalid mods and click start, or download updated versions, enable them and click start.
Now user has to not just to disable wrong mods but to enable one that passed before again.

If you want to change it into this, than remove incompatible mods from enabled section and report them in the splash screen instead as now it does not show nor enabled mods nor mods that tried to be enabled.

This commit now has outstanding concerns.May 20 2021, 7:22 PM

Thanks or the explanation.

In rP25475#51809, @Angen wrote:

Failed mods was list of all mods which user tried to enable, so in case of visual with gui, user would see in enabled section all mods which have been set in command or in config file.
Now user has to not just to disable wrong mods but to enable one that passed before again.

So it should be fixable by marking all mods as 'incompatible' when running the default mods, based on the code?

Harbormaster completed building B17365: rP25475: Fix mistake in rP25474 which stopped the incompatible mods page from showing..May 20 2021, 7:27 PM

But then you should report properly in case of non visual which mods caused the failure.
Edit: Ah you mean only if default mods kicks in, then yes as in non visual it should not start at all.

In rP25475#51815, @Angen wrote:

But then you should report properly in case of non visual which mods caused the failure

That still works.

edit to your edit -> yeah see control flow there. The problem is that I just reset the enabled mods, so the 'valid, didn't fail' mods don't get reported, as you noted.

(Edit: will fix this before the WE anyways)

wraitii mentioned this in D3996: Fix incompatible mods start: show both incompatible and enabled mods;.May 21 2021, 9:14 AM

Fixed in D3996

wraitii mentioned this in rP25510: Fix incompatible mods start: show both incompatible and enabled mods;.May 22 2021, 9:34 AM

Silier accepted this commit.May 22 2021, 10:08 AM

All concerns with this commit have now been addressed.May 22 2021, 10:08 AM