Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui

@@ -163,7 +163,7 @@
        <item>
         <widget class="QPushButton" name="pushButtonKinematicUnitPos1">
          <property name="enabled">
-          <bool>true</bool>
+          <bool>false</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

source/RobotAPI/libraries/skills/provider/Skill.cpp

@@ -44,8 +44,8 @@ namespace armarx
             stopped = false;
             timeoutReached = false;
 
-            provider = nullptr;
-            manager = nullptr;
+            //provider = nullptr;
+            //manager = nullptr;
 
             _reset();
         }

source/RobotAPI/libraries/skills/provider/Skill.h

@@ -68,8 +68,8 @@ namespace armarx
             long started = 0;
 
             /// proxies that called the skills
-            provider::dti::SkillProviderInterfacePrx provider;
-            manager::dti::SkillManagerInterfacePrx manager;
+            //provider::dti::SkillProviderInterfacePrx provider = nullptr;
+            //manager::dti::SkillManagerInterfacePrx manager = nullptr;
 
         protected:
             /// Use conditions during runtime this way