From bd05408cfbd0208c1c502ef4f357f376ba7cf957 Mon Sep 17 00:00:00 2001
From: Nikolaus Vahrenkamp <vahrenkamp@kit.edu>
Date: Tue, 31 May 2016 12:44:38 +0200
Subject: [PATCH] sanity check
---
.../libraries/core/remoterobot/RemoteRobot.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
index fa4636b56..ba63534b3 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
@@ -393,12 +393,12 @@ namespace armarx
ARMARX_ERROR_S << "Could not load robot file " << filename << ". Aborting..." << endl;
return result;
}
+ }
- if (scaling != 1.0f)
- {
- ARMARX_INFO_S << "Scaling robot to " << scaling;
- result = result->clone(result->getName(), result->getCollisionChecker(), scaling);
- }
+ if (result && scaling != 1.0f)
+ {
+ ARMARX_INFO_S << "Scaling robot to " << scaling;
+ result = result->clone(result->getName(), result->getCollisionChecker(), scaling);
}
synchronizeLocalClone(result, sharedRobotPrx);
--
GitLab