Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	src/bootstrap_gui.cpp
This commit is contained in:
Jonathan G Rennison
2020-12-07 17:56:44 +00:00
19 changed files with 94 additions and 34 deletions

View File

@@ -1407,6 +1407,7 @@ static void AddWindowToZOrdering(Window *w)
/* Search down the z-ordering for its location. */
WindowBase *v = _z_front_window;
uint last_z_priority = UINT_MAX;
(void)last_z_priority; // Unused without asserts
while (v != nullptr && (v->window_class == WC_INVALID || GetWindowZPriority(v->window_class) > GetWindowZPriority(w->window_class))) {
if (v->window_class != WC_INVALID) {
/* Sanity check z-ordering, while we're at it. */