From e1193bc05bf73964d91fbfdb48c2d85f07a0c847 Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Fri, 29 Feb 2008 06:13:23 +0000 Subject: [PATCH] assertions added to inspect potential bug in playlist item deletion code formatting cleanups in random number generators git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@857 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/RandomNumberGenerators.hpp | 7 +++---- src/qprojectM/QProjectM_MainWindow.cpp | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/projectM-engine/RandomNumberGenerators.hpp b/src/projectM-engine/RandomNumberGenerators.hpp index 8a1e4a959..f9c6cf1f0 100644 --- a/src/projectM-engine/RandomNumberGenerators.hpp +++ b/src/projectM-engine/RandomNumberGenerators.hpp @@ -61,11 +61,10 @@ inline std::size_t uniformInteger(std::size_t upperBound=1) { inline std::size_t weightedRandom(const std::vector & weights, int weightTotalHint = 0) { - if (weightTotalHint == 0) - for (std::size_t i = 0; i < weights.size();i++) { + if (weightTotalHint <= 0) + for (std::size_t i = 0; i < weights.size();i++) weightTotalHint += weights[i]; - } - + int sampledSum = uniformInteger(weightTotalHint); int sum = 0; diff --git a/src/qprojectM/QProjectM_MainWindow.cpp b/src/qprojectM/QProjectM_MainWindow.cpp index 171980071..904142c40 100644 --- a/src/qprojectM/QProjectM_MainWindow.cpp +++ b/src/qprojectM/QProjectM_MainWindow.cpp @@ -509,6 +509,7 @@ void QProjectM_MainWindow::removePlaylistItems(const QModelIndexList & items) { } PlaylistItemVector & lastCachedItems = *historyHash[previousFilter]; + assert (lastCachedItems.size() == playlistModel->rowCount()); QVector zombieItems; @@ -531,7 +532,7 @@ void QProjectM_MainWindow::removePlaylistItems(const QModelIndexList & items) { int index = cachedItems.indexOf(id); if (index >= 0) cachedItems.remove(index); - } + } } foreach (int key, reverseOrderKeys) {