Skip to content

Commit

Permalink
QMS-630 enable processing of userInputEvents in brouter synchronous r…
Browse files Browse the repository at this point in the history
…equest local eventloop
  • Loading branch information
ntruchsess authored and kiozen committed Aug 14, 2023
1 parent 0bf7de3 commit 034faee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[QMS-622] Update BRouter setup (install from github)
[QMS-630] BRouter on-the-fly routing cannot be canceled

V1.17.0
[QMS-429] Bad OSM Tag formatting crashes QMS
Expand Down
3 changes: 1 addition & 2 deletions src/qmapshack/gis/rte/router/CRouterBRouter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,7 @@ int CRouterBRouter::synchronousRequest(const QVector<QPointF>& points, const QLi
QEventLoop eventLoop;
connect(&progress, &CProgressDialog::rejected, reply, &QNetworkReply::abort);
connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);
// Processing userinputevents in local eventloop would cause a SEGV when clicking 'abort' of calling LineOp
eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
eventLoop.exec(QEventLoop::AllEvents);

const QNetworkReply::NetworkError& netErr = reply->error();
if (netErr == QNetworkReply::RemoteHostClosedError && nogos.size() > 1 && !isMinimumVersion(1, 4, 10)) {
Expand Down

0 comments on commit 034faee

Please sign in to comment.