Skip to content
Snippets Groups Projects
Commit 239055a0 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Merge remote-tracking branch 'origin/master' into devel

Conflicts:
	src/graphical-interface.impl.cpp
parents fcb19fa2 ca974192
No related branches found
No related tags found
No related merge requests found
......@@ -50,9 +50,7 @@ namespace graphics {
void GraphicalInterface::refresh () throw (Error)
{
try {
mtx_.lock();
return windowsManager_->refresh ();
mtx_.unlock();
} catch (const std::exception& exc) {
throw Error (exc.what ());
}
......@@ -323,9 +321,7 @@ namespace graphics {
bool GraphicalInterface::applyConfiguration (const char* nodeNameCorba, const value_type* configurationCorba) throw (Error)
{
try {
mtx_.lock();
return windowsManager_->applyConfiguration ( nodeNameCorba, configurationCorba) ;
mtx_.unlock();
} catch (const std::exception& exc) {
throw Error (exc.what ());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment