aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2019-08-04 14:39:31 -0700
committerPaul Gilbert2019-08-04 16:44:22 -0700
commit2d0912b59b6a5d02f5bfb131e0c288382ca83432 (patch)
treeb0be1baf2bb4f57a6c09e95d7c4ca8879563b208
parent4c16ecb47f3c91037c03fd4553d8b55dc0ebc426 (diff)
downloadscummvm-rg350-2d0912b59b6a5d02f5bfb131e0c288382ca83432.tar.gz
scummvm-rg350-2d0912b59b6a5d02f5bfb131e0c288382ca83432.tar.bz2
scummvm-rg350-2d0912b59b6a5d02f5bfb131e0c288382ca83432.zip
GLK: FROTZ: Fix crash in Arthur intro
-rw-r--r--engines/glk/window_pair.cpp19
1 files changed, 6 insertions, 13 deletions
diff --git a/engines/glk/window_pair.cpp b/engines/glk/window_pair.cpp
index e564e54b76..96d879a7c2 100644
--- a/engines/glk/window_pair.cpp
+++ b/engines/glk/window_pair.cpp
@@ -52,6 +52,12 @@ void PairWindow::rearrange(const Rect &box) {
_bbox = box;
+ if (_dir == winmethod_Arbitrary) {
+ // When a pair window is in "arbitrary" mode, each child window has it's own independant positioning,
+ // so thre's no need to be readjusting it
+ return;
+ }
+
if (!_backward) {
ch1 = _children[0];
ch2 = _children[1];
@@ -60,19 +66,6 @@ void PairWindow::rearrange(const Rect &box) {
ch2 = _children[0];
}
- if (_dir == winmethod_Arbitrary) {
- // When a pair window is in "arbitrary" mode, each child window has it's own independant positioning,
- // so thre's no need to be readjusting it
- /*
- for (int ctr = 0, idx = (_backward ? (int)_children.size() - 1 : 0); ctr < (int)_children.size();
- ++ctr, idx += (_backward ? -1 : 1)) {
- Window *w = _children[idx];
- w->rearrange();
- }
- */
- return;
- }
-
if (_vertical) {
min = _bbox.left;
max = _bbox.right;