Skip to content

Commit 6198474

Browse files
authored
Merge pull request #4103 from Goober5000/fix_wing_editor_crash
fix a FRED crash
2 parents ae5d458 + ceab0f8 commit 6198474

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

fred2/fred.rc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ BEGIN
11321132
CONTROL "IFF 9",IDC_FILTER_SHIPS_IFF_9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,128,139,68,10
11331133
END
11341134

1135-
IDD_WING_EDITOR DIALOGEX 0, 0, 298, 454
1135+
IDD_WING_EDITOR DIALOGEX 0, 0, 296, 473
11361136
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
11371137
EXSTYLE WS_EX_CLIENTEDGE
11381138
CAPTION "Wing Edit"
@@ -1170,7 +1170,7 @@ BEGIN
11701170
COMBOBOX IDC_DEPARTURE_TARGET,188,189,91,188,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
11711171
CONTROL "Tree1",IDC_DEPARTURE_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,160,270,121,84,WS_EX_CLIENTEDGE
11721172
CONTROL "No Warp Effect",IDC_NO_DEPARTURE_WARP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,356,92,10
1173-
EDITTEXT IDC_HELP_BOX,7,374,284,73,ES_MULTILINE | ES_READONLY,WS_EX_TRANSPARENT
1173+
EDITTEXT IDC_HELP_BOX,7,396,284,73,ES_MULTILINE | ES_READONLY,WS_EX_TRANSPARENT
11741174
LTEXT "Seconds",IDC_STATIC,245,141,33,8
11751175
PUSHBUTTON "Delete Wing",IDC_DELETE_WING,241,23,50,14,0,WS_EX_STATICEDGE
11761176
PUSHBUTTON "Disband Wing",IDC_DISBAND_WING,241,39,50,14,0,WS_EX_STATICEDGE
@@ -1198,6 +1198,7 @@ BEGIN
11981198
LTEXT "Target",IDC_STATIC,157,191,22,8
11991199
PUSHBUTTON "Restrict Arrival Paths",IDC_RESTRICT_ARRIVAL,15,223,122,14,0,WS_EX_STATICEDGE
12001200
PUSHBUTTON "Restrict Departure Paths",IDC_RESTRICT_DEPARTURE,160,223,123,14,0,WS_EX_STATICEDGE
1201+
EDITTEXT IDC_MINI_HELP_BOX,7,384,284,14,ES_MULTILINE | ES_READONLY,WS_EX_DLGMODALFRAME | WS_EX_TRANSPARENT
12011202
PUSHBUTTON "Custom Warp-in Parameters",IDC_CUSTOM_WARPIN_PARAMS,15,240,122,14,0,WS_EX_STATICEDGE
12021203
PUSHBUTTON "Custom Warp-out Parameters",IDC_CUSTOM_WARPOUT_PARAMS,160,240,123,14,0,WS_EX_STATICEDGE
12031204
COMBOBOX IDC_WING_FORMATION,192,89,99,127,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -2370,7 +2371,7 @@ BEGIN
23702371
LEFTMARGIN, 7
23712372
RIGHTMARGIN, 291
23722373
TOPMARGIN, 7
2373-
BOTTOMMARGIN, 447
2374+
BOTTOMMARGIN, 467
23742375
END
23752376

23762377
IDD_OPERATOR_ARGUMENT_TYPES, DIALOG

0 commit comments

Comments
 (0)