forked from qt-creator/qt-creator
Debugger: Fix number of appearances of data watch points
At least on Linux setting one data watch point resulted in two view entries, since we parse two responses (direct command response, and later GDB notification). Suppressing the second was not working well enough. Change-Id: Ica99c000d4912a9480a9e7020d2fdfdb866753b5 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
@@ -190,7 +190,6 @@ static inline bool fileNameMatch(const QString &f1, const QString &f2)
|
||||
|
||||
static bool isSimilarTo(const BreakpointParameters &data, const BreakpointResponse &needle)
|
||||
{
|
||||
// Clear hit.
|
||||
// Clear miss.
|
||||
if (needle.type != UnknownBreakpointType && data.type != UnknownBreakpointType
|
||||
&& data.type != needle.type)
|
||||
@@ -200,6 +199,10 @@ static bool isSimilarTo(const BreakpointParameters &data, const BreakpointRespon
|
||||
if (data.address && data.address == needle.address)
|
||||
return true;
|
||||
|
||||
// Clear hit.
|
||||
if (data == needle)
|
||||
return true;
|
||||
|
||||
// At least at a position we were looking for.
|
||||
// FIXME: breaks multiple breakpoints at the same location
|
||||
if (!data.fileName.isEmpty()
|
||||
|
||||
Reference in New Issue
Block a user