[rkward/frameworks] rkward/rbackend: Fix --backend-debugger opption

Thomas Friedrichsmeier null at kde.org
Tue May 23 12:49:14 UTC 2017


Git commit 7c055722562ef9a43d8d5da35351ddf1b5e67c66 by Thomas Friedrichsmeier.
Committed on 23/05/2017 at 12:49.
Pushed by tfry into branch 'frameworks'.

Fix --backend-debugger opption

M  +2    -2    rkward/rbackend/rkfrontendtransmitter.cpp
M  +0    -1    rkward/rbackend/rkrbackendprotocol_backend.cpp

https://commits.kde.org/rkward/7c055722562ef9a43d8d5da35351ddf1b5e67c66

diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp
index 99b64fb1..4932d1d5 100644
--- a/rkward/rbackend/rkfrontendtransmitter.cpp
+++ b/rkward/rbackend/rkfrontendtransmitter.cpp
@@ -114,13 +114,13 @@ void RKFrontendTransmitter::run () {
 	if (backend_executable.isEmpty ()) handleTransmissionError (i18n ("The backend executable could not be found. This is likely to be a problem with your installation."));
 	QString debugger = RKGlobals::startup_options["backend-debugger"].toString ();
 	args.prepend (RKCommonFunctions::windowsShellScriptSafeCommand (backend_executable));
-	args.prepend ("CMD");
 	if (!debugger.isEmpty ()) {
 		args = debugger.split (' ') + args;
 	}
+	args.prepend ("CMD");
 	if (DL_DEBUG >= RK_Debug::RK_Debug_Level) {
-		qDebug ("%s", qPrintable (args.join ("\n")));
 		qDebug ("%s", qPrintable (qgetenv ("R_BINARY")));
+		qDebug ("%s", qPrintable (args.join ("\n")));
 	}
 	backend->start (qgetenv ("R_BINARY"), args, QIODevice::ReadOnly);
 
diff --git a/rkward/rbackend/rkrbackendprotocol_backend.cpp b/rkward/rbackend/rkrbackendprotocol_backend.cpp
index 61d59ada..c0496814 100644
--- a/rkward/rbackend/rkrbackendprotocol_backend.cpp
+++ b/rkward/rbackend/rkrbackendprotocol_backend.cpp
@@ -31,7 +31,6 @@
 
 #include "rkbackendtransmitter.h"
 #include <QUuid>		// mis-used as a random-string generator
-#include <QTemporaryFile>
 #include <QDir>
 #include <QUrl>
 



More information about the rkward-tracker mailing list