From: Thomas F. <tho...@ru...> - 2015-01-05 19:54:30
|
Git commit 1b739959742a014ae7804aa23a0c22b9a405b399 by Thomas Friedrichsmeier. Committed on 05/01/2015 at 19:54. Pushed by tfry into branch 'master'. Fix a hang on exit M +1 -0 ChangeLog M +1 -0 rkward/rbackend/rkfrontendtransmitter.cpp http://commits.kde.org/rkward/1b739959742a014ae7804aa23a0c22b9a405b399 diff --git a/ChangeLog b/ChangeLog index 250d3c0..5960d9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +- Fix a hang-on-exit issue - Add R function rk.set.plugin.status() to allow further customization of loaded plugins (hiding of individual menu entries) - TODO: With the improved interface to plugins from R, make sure plugins can actually be modified at runtime without crashing (close and re-open them) - Pluginmap-management was reworked, partially, and moved to Settings->Manage R packages and plugins diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp index d6b50f8..99eab9b 100644 --- a/rkward/rbackend/rkfrontendtransmitter.cpp +++ b/rkward/rbackend/rkfrontendtransmitter.cpp @@ -125,6 +125,7 @@ void RKFrontendTransmitter::run () { connection->close (); backend->waitForFinished (); + delete backend; // otherwise it will be deleted via the constructor from the main thread, which can cause hangs. } void RKFrontendTransmitter::connectAndEnterLoop () { |