[education/rkward/testing/win_citest_timeout] rkward/rbackend: Delete server and backend, while still in the creating thread.
Thomas Friedrichsmeier
null at kde.org
Sun Oct 2 22:16:06 BST 2022
Git commit a05ef50ba55e499103079c3acda1a4f89df2f145 by Thomas Friedrichsmeier.
Committed on 02/10/2022 at 21:15.
Pushed by tfry into branch 'testing/win_citest_timeout'.
Delete server and backend, while still in the creating thread.
M +3 -11 rkward/rbackend/rkfrontendtransmitter.cpp
https://invent.kde.org/education/rkward/commit/a05ef50ba55e499103079c3acda1a4f89df2f145
diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp
index b1c05587..db49c694 100644
--- a/rkward/rbackend/rkfrontendtransmitter.cpp
+++ b/rkward/rbackend/rkfrontendtransmitter.cpp
@@ -53,12 +53,6 @@ RKFrontendTransmitter::~RKFrontendTransmitter () {
RK_TRACE (RBACKEND);
delete rkd_transmitter;
- RK_ASSERT (!server->isListening ());
- RK_DEBUG (RBACKEND, DL_DEBUG, "c");
- delete server;
- RK_DEBUG (RBACKEND, DL_DEBUG, "d");
- delete backend;
- RK_DEBUG (RBACKEND, DL_DEBUG, "e");
}
QString localeDir () {
@@ -181,12 +175,10 @@ void RKFrontendTransmitter::run () {
if (!connection) {
RK_ASSERT (false);
- } else if (connection->state() != QLocalSocket::UnconnectedState) {
- RK_DEBUG (RBACKEND, DL_DEBUG, "a");
- connection->abort();
- connection->waitForDisconnected(500);
- RK_DEBUG (RBACKEND, DL_DEBUG, "b");
}
+ RK_ASSERT(!server->isListening ());
+ delete server;
+ delete backend;
}
QString RKFrontendTransmitter::waitReadLine (QIODevice* con, int msecs) {
More information about the rkward-tracker
mailing list