From 63e9e456b869613078f60c53aa828748fa908d8c Mon Sep 17 00:00:00 2001
From: Mathieu Geisert <mgeisert@laas.fr>
Date: Mon, 13 Apr 2015 15:40:48 +0200
Subject: [PATCH] Lock mutex when writing/reading newNodeConfigurations (remove
error when multi-threads client is calling "refresh" and "applyConfiguration"
at the same time).
---
src/graphical-interface.impl.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/graphical-interface.impl.cpp b/src/graphical-interface.impl.cpp
index 4b42c2e..5fc9dd0 100644
--- a/src/graphical-interface.impl.cpp
+++ b/src/graphical-interface.impl.cpp
@@ -203,8 +203,8 @@ namespace graphics {
for (WindowManagers_t::iterator it = windowManagers_.begin ();
it!=windowManagers_.end (); ++it)
(*it)->frame ();
- mtx_.unlock ();
newNodeConfigurations_.clear ();
+ mtx_.unlock ();
} catch (const std::exception& exc) {
throw Error (exc.what ());
}
@@ -704,8 +704,10 @@ namespace graphics {
"quatY, quatZ]" <<std::endl;
return false;
}
+ mtx_.lock();
newNodeConfigurations_.push_back (newNodeConfiguration);
- return true;
+ mtx_.unlock();
+ return true;
}
} catch (const std::exception& exc) {
throw Error (exc.what ());
--
GitLab