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

Merge branch 'crashlog_improvements' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-02-19 12:57:55 +00:00
parent 018cc59079 102405e082
commit 064a36b319
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/window.cpp
View File

@@ -2597,6 +2597,8 @@ bool FocusWindowById(WindowClass cls, WindowNumber number)
*/
void HandleKeypress(uint keycode, WChar key)
{
if (InEventLoopPostCrash()) return;
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(HasModalProgress() || IsLocalCompany());
@@ -2801,6 +2803,8 @@ static void HandleKeyScrolling()
static void MouseLoop(MouseClick click, int mousewheel)
{
if (InEventLoopPostCrash()) return;
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(HasModalProgress() || IsLocalCompany());
@@ -2892,6 +2896,8 @@ static void MouseLoop(MouseClick click, int mousewheel)
*/
void HandleMouseEvents()
{
if (InEventLoopPostCrash()) return;
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(HasModalProgress() || IsLocalCompany());
@@ -2999,6 +3005,8 @@ static void CheckSoftLimit()
*/
void InputLoop()
{
if (InEventLoopPostCrash()) return;
/* World generation is multithreaded and messes with companies.
* But there is no company related window open anyway, so _current_company is not used. */
assert(HasModalProgress() || IsLocalCompany());