Commit 78b15508 authored by Alexander Semke's avatar Alexander Semke

Don't do any kill() calls on windows, temporary solution to get the windows build fixed first.

parent 1b3c95db
......@@ -27,7 +27,9 @@
#include <QDebug>
#include <KProcess>
#ifndef Q_OS_WIN
#include <signal.h>
#endif
RSession::RSession( Cantor::Backend* backend) : Session(backend)
{
......@@ -73,9 +75,16 @@ void RSession::logout()
void RSession::interrupt()
{
qDebug()<<"interrupt" << m_rProcess->pid();
if (m_rProcess->pid())
kill(m_rProcess->pid(), 2);
const int pid = m_rProcess->pid();
qDebug()<<"interrupt" << pid;
if (pid)
{
#ifndef Q_OS_WIN
kill(pid, SIGINT);
#else
//TODO: interrupt the process on windows
#endif
}
m_expressionQueue.removeFirst();
changeStatus(Cantor::Session::Done);
}
......
......@@ -34,7 +34,11 @@
#include <KMessageBox>
#include <KLocalizedString>
#ifndef Q_OS_WIN
#include <signal.h>
#endif
//NOTE: the \\s in the expressions is needed, because Maxima seems to sometimes insert newlines/spaces between the letters
//maybe this is caused by some behaviour if the Prompt is split into multiple "readStdout" calls
......
......@@ -35,7 +35,10 @@
#include "octavehighlighter.h"
#include <settings.h>
#ifndef Q_OS_WIN
#include <signal.h>
#endif
#include <defaultvariablemodel.h>
OctaveSession::OctaveSession ( Cantor::Backend* backend ) : Session ( backend ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment