Commit 33695b81 authored by hjk's avatar hjk
Browse files

debugger: fix e539f5bd

parent e70530c5
......@@ -50,6 +50,7 @@ void GdbEngine::updateLocalsPython(const QByteArray &varList)
PRECONDITION;
m_processedNames.clear();
manager()->watchHandler()->beginCycle(false);
//m_toolTipExpression.clear();
WatchHandler *handler = m_manager->watchHandler();
......
......@@ -397,10 +397,11 @@ void WatchModel::emitAllChanged()
emit layoutChanged();
}
void WatchModel::beginCycle()
void WatchModel::beginCycle(bool clearFetchTriggered)
{
m_fetchTriggered.clear();
emit enableUpdates(false);
if (clearFetchTriggered)
m_fetchTriggered.clear();
}
void WatchModel::endCycle()
......@@ -1192,12 +1193,12 @@ WatchHandler::WatchHandler(DebuggerManager *manager)
SIGNAL(triggered()), this, SLOT(emitAllChanged()));
}
void WatchHandler::beginCycle()
void WatchHandler::beginCycle(bool clearFetchTriggered)
{
++generationCounter;
m_locals->beginCycle();
m_watchers->beginCycle();
m_tooltips->beginCycle();
m_locals->beginCycle(clearFetchTriggered);
m_watchers->beginCycle(clearFetchTriggered);
m_tooltips->beginCycle(clearFetchTriggered);
}
void WatchHandler::endCycle()
......
......@@ -225,7 +225,7 @@ private:
void emitDataChanged(int column,
const QModelIndex &parentIndex = QModelIndex());
void beginCycle(); // called at begin of updateLocals() cycle
void beginCycle(bool clearFetchTriggered); // called at begin of updateLocals() cycle
void endCycle(); // called after all results have been received
friend QDebug operator<<(QDebug d, const WatchModel &m);
......@@ -266,7 +266,9 @@ public:
Q_SLOT void removeWatchExpression();
Q_SLOT void removeWatchExpression(const QString &exp);
Q_SLOT void emitAllChanged();
void beginCycle(); // called at begin of updateLocals() cycle
// called at begin of updateLocals() cycle
void beginCycle(bool clearFetchTriggered = true);
void updateWatchers(); // called after locals are fetched
void endCycle(); // called after all results have been received
void showEditValue(const WatchData &data);
......
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