From 2ef7edcbcc74a87aada9711bd18e4453dda1a691 Mon Sep 17 00:00:00 2001 From: Sam Spilsbury Date: Fri, 27 Feb 2009 13:15:17 +0900 Subject: [PATCH] Temporary fix for infinite loop --- plugins/scale/scale.cpp | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/scale/scale.cpp b/plugins/scale/scale.cpp index ff3d047..19e8776 100644 --- a/plugins/scale/scale.cpp +++ b/plugins/scale/scale.cpp @@ -532,16 +532,17 @@ PrivateScaleScreen::findBestSlots () CompWindow *w; int i, j, d, d0 = 0; float sx, sy, cx, cy; + int count = 0; foreach (ScaleWindow *sw, windows) { + count++; w = sw->priv->window; if (sw->priv->slot) continue; sw->priv->sid = 0; - sw->priv->distance = MAXSHORT; for (j = 0; j < nSlots; j++) { @@ -557,11 +558,9 @@ PrivateScaleScreen::findBestSlots () cy -= sy; d = sqrt (cx * cx + cy * cy); - if (d0 + d < sw->priv->distance) - { - sw->priv->sid = j; - sw->priv->distance = d0 + d; - } + + sw->priv->sid = j; + sw->priv->distance = d0 + d; } } -- 1.5.6