From efc042ff484bb6125a8a533c7d942edb7b2de9bc Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Tue, 17 Nov 2020 19:56:49 +0900 Subject: [PATCH] Window: Fix dead assignment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix value stored to 'maxWidth' or 'maxHeight' is never read when maxWidth > fMaxWidth or maxHeight > fMaxHeight. Pointed out by Clang Static Analyzer. Change-Id: I2bd0b8712d47e64298c0f915f24f7f1c87f4362e Reviewed-on: https://review.haiku-os.org/c/haiku/+/3474 Reviewed-by: Adrien Destugues Reviewed-by: Jérôme Duval --- src/kits/interface/Window.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp index 4af569f81b..4786ed0e81 100644 --- a/src/kits/interface/Window.cpp +++ b/src/kits/interface/Window.cpp @@ -1234,7 +1234,7 @@ FrameMoved(origin); _AdoptResize(); FrameResized(width, height); } - + // draw int32 count = infos.CountItems(); for (int32 i = 0; i < count; i++) { @@ -1517,13 +1517,11 @@ BWindow::SetZoomLimits(float maxWidth, float maxHeight) // TODO: What about locking?!? if (maxWidth > fMaxWidth) maxWidth = fMaxWidth; - else - fMaxZoomWidth = maxWidth; + fMaxZoomWidth = maxWidth; if (maxHeight > fMaxHeight) maxHeight = fMaxHeight; - else - fMaxZoomHeight = maxHeight; + fMaxZoomHeight = maxHeight; }