Merge pull request #33379 from musescore/fix_timeout_crash_470

[4.7.0] Fix crash on timeout

Author: RomanPudashkin

src/musesounds/internal/musesamplercheckupdateservice.cpp

@@ -87,12 +87,14 @@ Promise<RetVal<bool> > MuseSamplerCheckUpdateService::checkForUpdate()
         queryBuffer->setData(configuration()->getMuseSamplerVersionQuery().toUtf8());
         auto receivedData = std::make_shared<QBuffer>();
 
-        m_networkManager = networkManagerCreator()->makeNetworkManager();
+        if (!m_networkManager) {
+            m_networkManager = networkManagerCreator()->makeNetworkManager();
+        }
+
         RetVal<Progress> progress = m_networkManager->post(configuration()->checkForMuseSamplerUpdateUrl(),
                                                            queryBuffer, receivedData,
                                                            configuration()->headers());
         if (!progress.ret) {
-            m_networkManager = nullptr;
             return resolve(RetVal<bool>::make_ret(progress.ret));
         }
 
@@ -108,7 +110,6 @@ Promise<RetVal<bool> > MuseSamplerCheckUpdateService::checkForUpdate()
             }
 
             (void)resolve(result);
-            m_networkManager = nullptr;
         });
 
         return Promise<RetVal<bool> >::dummy_result();

src/musesounds/internal/musesoundscheckupdateservice.cpp

@@ -78,19 +78,21 @@ Promise<RetVal<ReleaseInfo> > MuseSoundsCheckUpdateService::checkForUpdate()
 
         auto buff = std::make_shared<QBuffer>();
         QUrl url = configuration()->checkForMuseSoundsUpdateUrl();
-        m_networkManager = networkManagerCreator()->makeNetworkManager();
+
+        if (!m_networkManager) {
+            m_networkManager = networkManagerCreator()->makeNetworkManager();
+        }
+
         RetVal<Progress> progress = m_networkManager->get(url, buff);
 
         if (!progress.ret) {
             m_lastCheckResult.ret = progress.ret;
-            m_networkManager = nullptr;
             return resolve(m_lastCheckResult);
         }
 
         progress.val.finished().onReceive(this, [this, buff, resolve](const ProgressResult& res) {
             DEFER {
                 (void)resolve(m_lastCheckResult);
-                m_networkManager = nullptr;
             };
 
             if (!res.ret) {

src/musesounds/internal/musesoundsrepository.cpp

@@ -96,18 +96,19 @@ void MuseSoundsRepository::init()
     device->setData(jsonData);
     auto receivedData = std::make_shared<QBuffer>();
 
-    m_networkManager = networkManagerCreator()->makeNetworkManager();
+    if (!m_networkManager) {
+        m_networkManager = networkManagerCreator()->makeNetworkManager();
+    }
+
     RetVal<Progress> progress = m_networkManager->post(url, device, receivedData, headers);
     if (!progress.ret) {
         LOGE() << progress.ret.toString();
-        m_networkManager = nullptr;
         return;
     }
 
     progress.val.finished().onReceive(this, [this, receivedData](const muse::ProgressResult& res) {
         if (!res.ret) {
             LOGE() << res.ret.toString();
-            m_networkManager = nullptr;
             return;
         }
 
@@ -124,7 +125,6 @@ void MuseSoundsRepository::init()
 
         m_soundsСatalogs = result.val;
         m_soundsСatalogsChanged.notify();
-        m_networkManager = nullptr;
     });
 }