Fix crash when hw-monitor command fails on bulk at make_zr300_device

(cherry picked from commit 881494995ad7c37470746e22c3deea77d24b3f72)
yeshbourne · Aug 18, 2016 · 6e9b2ac · 6e9b2ac
1 parent 735a065
commit 6e9b2ac
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/zr300.cpp b/src/zr300.cpp
@@ -443,8 +443,11 @@ namespace rsimpl
             std::timed_mutex mtx;
             try
             {
-                ivcam::get_firmware_version_string(*device, mtx, info.camera_info[RS_CAMERA_INFO_ADAPTER_BOARD_FIRMWARE_VERSION], (int)adaptor_board_command::GVD);
-                ivcam::get_firmware_version_string(*device, mtx, info.camera_info[RS_CAMERA_INFO_MOTION_MODULE_FIRMWARE_VERSION], (int)adaptor_board_command::GVD, 4);
+                std::string version_string;
+                ivcam::get_firmware_version_string(*device, mtx, version_string, (int)adaptor_board_command::GVD);
+                info.camera_info[RS_CAMERA_INFO_ADAPTER_BOARD_FIRMWARE_VERSION] = version_string;
+                ivcam::get_firmware_version_string(*device, mtx, version_string, (int)adaptor_board_command::GVD, 4);
+                info.camera_info[RS_CAMERA_INFO_MOTION_MODULE_FIRMWARE_VERSION] = version_string;
             }
             catch (...)
             {