From 7186f0988a887202a97f0a1ffa2d9cdd932a6dc6 Mon Sep 17 00:00:00 2001
From: Brian Ferguson <ferguson.brian@gmail.com>
Date: Thu, 28 Feb 2013 14:46:17 -0700
Subject: [PATCH] FileView: Tweaks and cosmetics.

---
 Plugins/PluginFileView/PluginFileView.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Plugins/PluginFileView/PluginFileView.cpp b/Plugins/PluginFileView/PluginFileView.cpp
index a078707b..6df03db8 100644
--- a/Plugins/PluginFileView/PluginFileView.cpp
+++ b/Plugins/PluginFileView/PluginFileView.cpp
@@ -89,8 +89,7 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
 		
 		for (auto iter : g_ParentMeasures)
 		{
-			if (_wcsicmp(iter->name, path.c_str()) == 0 &&
-				iter->skin == skin)
+			if (_wcsicmp(iter->name, path.c_str()) == 0 && iter->skin == skin)
 			{
 				child->parent = iter;
 				break;
@@ -687,6 +686,9 @@ unsigned __stdcall SystemThreadProc(void* pParam)
 	{
 		EnterCriticalSection(&g_CriticalSection);
 		parent->files.clear();
+		parent->fileCount = 0;
+		parent->folderCount = 0;
+		parent->folderSize = 0;
 		LeaveCriticalSection(&g_CriticalSection);
 
 		tmp->files.clear();
@@ -729,21 +731,18 @@ unsigned __stdcall SystemThreadProc(void* pParam)
 			RecursiveType rType = tmp->recursiveType;
 			GetFolderInfo(folderQueue, folder, tmp, (rType == RECURSIVE_PARTIAL) ? RECURSIVE_NONE : rType);
 
-			if (rType != RECURSIVE_NONE)
+			while (rType != RECURSIVE_NONE && !folderQueue.empty())
 			{
-				while (!folderQueue.empty())
-					{
-						folder = folderQueue.front();
-						GetFolderInfo(folderQueue, folder, tmp, rType);
-						folderQueue.pop();
-					}
+				folder = folderQueue.front();
+				GetFolderInfo(folderQueue, folder, tmp, rType);
+				folderQueue.pop();
 			}
 		}
 
 		// Sort
 		const int sortAsc = tmp->sortAscending ? 1 : -1;
-		auto begin = ((tmp->path != L"" || !tmp->path.empty()) && (tmp->showDotDot && tmp->recursiveType != RECURSIVE_FULL)) ?
-			tmp->files.begin() + 1: tmp->files.begin();
+		auto begin = ((tmp->path != L"" || !tmp->path.empty()) && 
+			(tmp->showDotDot && tmp->recursiveType != RECURSIVE_FULL)) ? tmp->files.begin() + 1: tmp->files.begin();
 
 		switch (tmp->sortType)
 		{
@@ -852,6 +851,7 @@ unsigned __stdcall SystemThreadProc(void* pParam)
 
 		EnterCriticalSection(&g_CriticalSection);
 		parent->files = tmp->files;
+		parent->files.shrink_to_fit();
 		parent->fileCount = tmp->fileCount;
 		parent->folderCount = tmp->folderCount;
 		parent->folderSize = tmp->folderSize;