Page MenuHomeWildfire Games

Fixed assert fails in Actor Editor
Needs ReviewPublic

Authored by shh on Fri, Mar 8, 3:19 PM.

Details

Reviewers
vladislavbelov
wraitii
Yves
Trac Tickets
#5408
Summary

The first assert was from wxWidgets. It fails as both expand and align flags are passed to the sizer. Removed align flag to match the dialog as shown here.
Second assert was simply not true. So I've changed it to if statement.

Test Plan

After reproducing steps from ticket, no assert is failed.

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

shh created this revision.Fri, Mar 8, 3:19 PM
Vulcan added a subscriber: Vulcan.Fri, Mar 8, 3:21 PM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
|   1| /*·Copyright·(C)·2009·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2009"

source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp
|   1| /*·Copyright·(C)·2014·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2014"
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/differential/1085/display/redirect

shh added a comment.Fri, Mar 8, 3:23 PM

Oops, I've forgot to fix the copyright year. Should I fix and add new diff?

vladislavbelov added inline comments.Fri, Mar 8, 3:36 PM
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/EditableListCtrl.cpp
79–80

By CC:

if (col < 0 || col >= static_cast<int>(m_ColumnTypes.size()))
    return;
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
54

Which version of wxWidget do you use? Because it may depend on the version and may don't work for some old but still supported version AFAIK.

You could use "Update Diff" in right panel or update via arch.

shh updated this revision to Diff 7531.Fri, Mar 8, 3:52 PM
shh marked an inline comment as done.
shh added inline comments.
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
54

I'm using 3.1.2. Which versions are supported? I may try on them too.

shh added inline comments.Fri, Mar 8, 4:06 PM
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasDialog.cpp
54

Quick note. The assert was added for this combination of flags by this commit on Apr 3, 2015. According to wikipedia it should be added to wxWIdgets 3.0.3.

shh updated this revision to Diff 7532.Fri, Mar 8, 4:07 PM
Angen added a subscriber: Angen.EditedSun, Mar 17, 8:22 PM

I can confirm this is fixing assertion error in both cases described in ticket.