PR #8206 from Nir: Fix FW update exception showed after entering upda…

…te state
IntelRealSense · Jan 21, 2021 · eb66c68 · eb66c68
2 parents ea575ed + de93cf6
commit eb66c68
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/common/fw-update-helper.cpp b/common/fw-update-helper.cpp
@@ -233,6 +233,8 @@ namespace rs2
             {
                 log("Requesting to switch to recovery mode");
                 upd.enter_update_state();
+                // Allow time for the device to disconnect before calling "query_devices"
+                std::this_thread::sleep_for(std::chrono::seconds(2));
 
                 if (!check_for([this, serial, &dfu]() {
                     auto devs = _ctx.query_devices();
@@ -255,9 +257,10 @@ namespace rs2
                             }
                         }
                         catch (std::exception &e) {
-                            std::stringstream s;
-                            s << "Exception caught in FW Update process-flow: " << e.what();
-                            log(s.str().c_str());
+                            _viewer.not_model->output.add_log( RS2_LOG_SEVERITY_WARN,
+                                __FILE__,
+                                __LINE__,
+                                to_string() << "Exception caught in FW Update process-flow: " << e.what() << "; Retrying..." );
                         }
                         catch (...) {}
                     }