merged set_settings race condition fix into trunk

2012-04-06 03:02:50 +00:00
parent d7a3e823b5
commit 9024209d51
4 changed files with 11 additions and 10 deletions
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -1865,7 +1865,7 @@ namespace aux {
 	void session_impl::update_disk_thread_settings()
 	{
 		disk_io_job j;
-		j.buffer = (char*)&m_settings;
+		j.buffer = (char*)new session_settings(m_settings);
 		j.action = disk_io_job::update_settings;
 		m_disk_thread.add_job(j);
 	}