From 180854c617e1a7884e5996ab01ec751cf858aead Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 7 Apr 2015 23:16:26 -0400 Subject: [PATCH] Debugger: Fix memory leaks related to grid tables Incrementing the reference count here isn't necessary, as they construct with a count of 1. Incrementing again results in the attributes not being freed. --- Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp | 1 - Source/Core/DolphinWX/Debugger/RegisterView.cpp | 1 - Source/Core/DolphinWX/Debugger/WatchView.cpp | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp index 0eece2d15c..4b1ecfd72a 100644 --- a/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp @@ -70,7 +70,6 @@ wxGridCellAttr *CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKi if (col == 1) attr->SetTextColour(m_CachedRegHasChanged[row] ? *wxRED : *wxBLACK); - attr->IncRef(); return attr; } diff --git a/Source/Core/DolphinWX/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Debugger/RegisterView.cpp index 5e35ef84a3..44d51750cf 100644 --- a/Source/Core/DolphinWX/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Debugger/RegisterView.cpp @@ -241,7 +241,6 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind) } attr->SetTextColour(red ? *wxRED : *wxBLACK); - attr->IncRef(); return attr; } diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp index d2349a94e3..9008ae7376 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp @@ -208,7 +208,7 @@ wxGridCellAttr* CWatchTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKin attr->SetBackgroundColour(*wxLIGHT_GREY); } } - attr->IncRef(); + return attr; }