feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Add missing initialization.

Browse Source 
Task-number: QTCREATORBUG-1461 (part 1)
This commit is contained in:
ck
2010-05-25 15:26:37 +02:00
parent 9e8219fda2
commit 10ac946825
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
View File

@@ -104,8 +104,7 @@ bool MaemoSshRunner::runInternal()
createConnection(); createConnection();
connect(m_connection.data(), SIGNAL(remoteOutputAvailable()), connect(m_connection.data(), SIGNAL(remoteOutputAvailable()),
this, SLOT(handleRemoteOutput())); this, SLOT(handleRemoteOutput()));
m_endMarkerCount = 0; initState();
m_promptEncountered = false;
if (!m_connection->start()) if (!m_connection->start())
return false; return false;
if (stopRequested()) if (stopRequested())
@@ -115,6 +114,13 @@ bool MaemoSshRunner::runInternal()
return !m_connection->hasError(); return !m_connection->hasError();
} }
void MaemoSshRunner::initState()
{
m_endMarkerCount = 0;
m_promptEncountered = false;
m_potentialEndMarkerPrefix.clear();
}
void MaemoSshRunner::handleRemoteOutput() void MaemoSshRunner::handleRemoteOutput()
{ {
const QByteArray output const QByteArray output

1
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
View File

@@ -97,6 +97,7 @@ signals:
private: private:
virtual bool runInternal(); virtual bool runInternal();
Q_SLOT void handleRemoteOutput(); Q_SLOT void handleRemoteOutput();
void initState();
static const QByteArray EndMarker; static const QByteArray EndMarker;