Merge branch 'master' of http://github.com/godbolt/qgroundcontrol

src/uas/UAS.cc

@@ -948,13 +948,12 @@ void UAS::setParameter(int component, QString id, float value)
     p.target_component = (uint8_t)component;
 
     // Copy string into buffer, ensuring not to exceed the buffer size    
-    char* s = (char*)id.toStdString().c_str();
     for (unsigned int i = 0; i < sizeof(p.param_id); i++)
     {
         // String characters
         if ((int)i < id.length() && i < (sizeof(p.param_id) - 1))
         {
-            p.param_id[i] = s[i];
+            p.param_id[i] = id.toAscii()[i];
         }
         // Null termination at end of string or end of buffer
         else if ((int)i == id.length() || i == (sizeof(p.param_id) - 1))