From 6a254778e2bcfe7df0b40bf8a0db37159a706315 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 4 Jan 2015 23:51:43 +0100
Subject: Linux/MacOSX: Add wait dialog to the benchmark computation. Correct
 handling of wait dialog call when changing password and creating volumes.

---
 src/Main/Forms/BenchmarkDialog.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/Main/Forms/BenchmarkDialog.h')

diff --git a/src/Main/Forms/BenchmarkDialog.h b/src/Main/Forms/BenchmarkDialog.h
index b127295f..a9b42a58 100644
--- a/src/Main/Forms/BenchmarkDialog.h
+++ b/src/Main/Forms/BenchmarkDialog.h
@@ -36,7 +36,20 @@ namespace VeraCrypt
 			uint64 MeanSpeed;
 		};
 
+		void DoBenchmark (list<BenchmarkResult>& results, Buffer& buffer);
 		void OnBenchmarkButtonClick (wxCommandEvent& event);
+		
+		class BenchmarkThreadRoutine : public WaitThreadRoutine
+		{
+		public:
+			BenchmarkDialog* m_pDlg;
+			list<BenchmarkResult>& m_results;
+			Buffer& m_buffer;
+			BenchmarkThreadRoutine(BenchmarkDialog* pDlg, list<BenchmarkResult>& results, Buffer& buffer)
+				: m_pDlg(pDlg), m_results(results), m_buffer(buffer) { }
+			virtual ~BenchmarkThreadRoutine() { }
+			virtual void ExecutionCode(void) { m_pDlg->DoBenchmark (m_results, m_buffer); }
+		};
 	};
 }
 
-- 
cgit v1.2.3