miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 1.10.0-RC1

Browse Source
This commit is contained in:
dP
2020-02-18 20:56:38 +03:00
parent e908a0bf95 cc96ca5b22
commit 9b9a850d0b
204 changed files with 3153 additions and 1064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/window.cpp
View File

@@ -391,7 +391,7 @@ QueryString *Window::GetQueryString(uint widnum)
*/
/* virtual */ Point Window::GetCaretPosition() const
{
if (this->nested_focus != nullptr && this->nested_focus->type == WWT_EDITBOX) {
if (this->nested_focus != nullptr && this->nested_focus->type == WWT_EDITBOX && !this->querystrings.empty()) {
return this->GetQueryString(this->nested_focus->index)->GetCaretPosition(this, this->nested_focus->index);
}
@@ -1096,6 +1096,9 @@ Window::~Window()
/* We can't scroll the window when it's closed. */
if (_last_scroll_window == this) _last_scroll_window = nullptr;
/* Make sure we don't try to access non-existing query strings. */
this->querystrings.clear();
/* Make sure we don't try to access this window as the focused window when it doesn't exist anymore. */
if (_focused_window == this) {
this->OnFocusLost();