Merge remote-tracking branch 'upstream/master'

2021-09-27 19:53:01 +03:00
parent 02a1224535 407b10e090
commit 239ff976da
173 changed files with 31132 additions and 9502 deletions
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -117,7 +117,6 @@ public:
 		NWidgetMatrix *matrix = this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX);
 		matrix->SetScrollbar(this->GetScrollbar(WID_BO_SELECT_SCROLL));

-		this->SetFocusedWidget(WID_BO_FILTER);
 		this->GetWidget<NWidgetMatrix>(WID_BO_OBJECT_MATRIX)->SetCount(4);

 		ResetObjectToPlace();