[rkward] rkward/rbackend: Fix some wrong flags wrt command cancelling

[Thomas Friedrichsmeier]

Git commit a8c49ab1427953c13fd9d14520e8da9070afed5a by Thomas Friedrichsmeier.
Committed on 21/04/2018 at 19:32.
Pushed by tfry into branch 'master'.

Fix some wrong flags wrt command cancelling

M  +3    -3    rkward/rbackend/rkrinterface.cpp

https://commits.kde.org/rkward/a8c49ab1427953c13fd9d14520e8da9070afed5a

diff --git a/rkward/rbackend/rkrinterface.cpp b/rkward/rbackend/rkrinterface.cpp
index 02296378..514e2494 100644
--- a/rkward/rbackend/rkrinterface.cpp
+++ b/rkward/rbackend/rkrinterface.cpp
@@ -520,10 +520,10 @@ void RInterface::cancelAll () {
 bool RInterface::softCancelCommand (RCommand* command) {
 	RK_TRACE (RBACKEND);
 
-	if (!(command->type () && RCommand::Running)) {
+	if (!(command->type () & RCommand::Running)) {
 		cancelCommand (command);
 	}
-	return command->status && RCommand::Canceled;
+	return command->status & RCommand::Canceled;
 }
 
 void RInterface::cancelCommand (RCommand *command) {
@@ -531,7 +531,7 @@ void RInterface::cancelCommand (RCommand *command) {
 
 	if (!(command->type () & RCommand::Sync)) {
 		command->status |= RCommand::Canceled;
-		if (command->type () && RCommand::Running) {
+		if (command->type () & RCommand::Running) {
 			if ((RKDebugHandler::instance ()->state () == RKDebugHandler::InDebugPrompt) && (command == RKDebugHandler::instance ()->command ())) {
 				RKDebugHandler::instance ()->sendCancel ();
 			} else {