dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/console_cmds.cpp
#	src/date.cpp
#	src/economy.cpp
#	src/misc.cpp
#	src/newgrf_house.cpp
This commit is contained in:
Jonathan G Rennison
2020-01-29 19:32:06 +00:00
parent ab1b8ab209 2fee030a26
commit 81a1094cc8
52 changed files with 787 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/window.cpp
View File

@@ -392,7 +392,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);
}
@@ -1107,6 +1107,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) {
_focused_window = nullptr;