[QMS-624] Catch exception properly

kiozen · kiozen · commit 0a2221301bac · 2023-08-10T15:43:51.000+02:00
diff --git a/src/qmapshack/gis/rte/router/CRouterBRouter.cpp b/src/qmapshack/gis/rte/router/CRouterBRouter.cpp
@@ -383,9 +383,12 @@ int CRouterBRouter::synchronousRequest(const QVector<QPointF>& points, const QLi
   } catch (const QString& msg) {
     coords.clear();
     if (!msg.isEmpty()) {
+      CCanvas* canvas = CMainWindow::self().getVisibleCanvas();
+      if (canvas) {
+        canvas->reportStatus("BRouter", tr("<b>BRouter</b><br/>Bad response from server:<br/>%1").arg(msg));
+      }
+      timerCloseStatusMsg->start();
       reply->deleteLater();
-      mutex.unlock();
-      throw tr("Bad response from server: %1").arg(msg);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -383,9 +383,12 @@ int CRouterBRouter::synchronousRequest(const QVector<QPointF>& points, const QLi`
`383`	`383`	`} catch (const QString& msg) {`
`384`	`384`	`coords.clear();`
`385`	`385`	`if (!msg.isEmpty()) {`
	`386`	`+ CCanvas* canvas = CMainWindow::self().getVisibleCanvas();`
	`387`	`+ if (canvas) {`
	`388`	`+ canvas->reportStatus("BRouter", tr("<b>BRouter</b><br/>Bad response from server:<br/>%1").arg(msg));`
	`389`	`+ }`
	`390`	`+ timerCloseStatusMsg->start();`
`386`	`391`	`reply->deleteLater();`
`387`		`- mutex.unlock();`
`388`		`- throw tr("Bad response from server: %1").arg(msg);`
`389`	`392`	`}`
`390`	`393`	`}`
`391`	`394`