Assign ActiveWindowID to NullWindowID if window doesn't exist, misc
This commit is contained in:
@@ -603,11 +603,17 @@ void Update(Event event) {
|
||||
}
|
||||
}
|
||||
|
||||
ActiveWindowID = NextActiveWindowID;
|
||||
Window *window = GetWindow(ActiveWindowID, NULL);
|
||||
if (window == NULL || window->visible == false) {
|
||||
ActiveWindowID = NextActiveWindowID = LastActiveLayoutWindowID;
|
||||
window = GetWindow(ActiveWindowID);
|
||||
{
|
||||
ActiveWindowID = NextActiveWindowID;
|
||||
Window *window = GetWindow(ActiveWindowID, NULL);
|
||||
if (window == NULL || window->visible == false) {
|
||||
ActiveWindowID = NextActiveWindowID = LastActiveLayoutWindowID;
|
||||
window = GetWindow(ActiveWindowID, NULL);
|
||||
if (window == NULL) {
|
||||
ActiveWindowID = NullWindowID;
|
||||
Assert(GetWindow(ActiveWindowID, NULL));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Behavior where these windows cannot be visible at the same time
|
||||
@@ -625,6 +631,7 @@ void Update(Event event) {
|
||||
}
|
||||
|
||||
if (ActiveWindowID != LastActiveLayoutWindowID) {
|
||||
Window *window = GetWindow(ActiveWindowID, NULL);
|
||||
if (window->layout) {
|
||||
LastActiveLayoutWindowID = ActiveWindowID;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user