[rkward-cvs] [rkward] rkward/rbackend: D'uh: handleCommandOut() has already deleted the command...

[Thomas Friedrichsmeier]

Git commit 619a6764a25fd84e6388a1e0b21953db88325fcc by Thomas Friedrichsmeier.
Committed on 30/11/2014 at 13:58.
Pushed by tfry into branch 'master'.

D'uh: handleCommandOut() has already deleted the command...

M  +1    -4    rkward/rbackend/rinterface.cpp

http://commits.kde.org/rkward/619a6764a25fd84e6388a1e0b21953db88325fcc

diff --git a/rkward/rbackend/rinterface.cpp b/rkward/rbackend/rinterface.cpp
index ce455b5..2a19abc 100644
--- a/rkward/rbackend/rinterface.cpp
+++ b/rkward/rbackend/rinterface.cpp
@@ -166,12 +166,9 @@ void RInterface::closeSubcommandChain (RCommand* parent_command) {
 		doNextCommand (0);
 	}
 	if (parent_command && (parent_command == dummy_command_on_stack)) {
-		handleCommandOut (dummy_command_on_stack);
 		all_current_commands.removeAll (dummy_command_on_stack);
 		RCommandStack::pop (dummy_command_on_stack);
-		// TODO: I don't quite understand why the line below crashes (in RData::discardData()).
-		// However it's a tolerably slow mem-leak, by all means.
-//		delete dummy_command_on_stack;
+		handleCommandOut (dummy_command_on_stack);
 		dummy_command_on_stack = 0;
 	}
 }