mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict between two classes named app::Item (in brush_popup.cpp and data_recovery_view.cpp)

Browse Source 
This conflict was generating a crash when the "Recover Lost Sprites"
button was pressed.
This commit is contained in:
David Capello 2015-05-06 17:23:43 -03:00
parent cb5fd3963f
commit 9dfd5ae0d3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/ui/brush_popup.cpp
View File

@ -38,6 +38,8 @@ using namespace app::skin;
using namespace doc;
using namespace ui;
namespace {
class Item : public ButtonSet::Item {
public:
Item(BrushPopup* popup, BrushPopupDelegate* delegate, const BrushRef& brush, int slot = -1)
@ -96,6 +98,8 @@ private:
int m_slot;
};
} // anonymous namespace
static BrushRef defBrushes[3];
BrushPopup::BrushPopup(BrushPopupDelegate* delegate)

4
src/app/ui/data_recovery_view.cpp
View File

@ -34,6 +34,8 @@ namespace app {
using namespace ui;
using namespace app::skin;
namespace {
class Item : public ListItem {
public:
Item(crash::Session* session, crash::Session::Backup* backup)
@ -128,6 +130,8 @@ private:
ui::Button m_deleteButton;
};
} // anonymous namespace
DataRecoveryView::DataRecoveryView(crash::DataRecovery* dataRecovery)
: Box(JI_VERTICAL)
, m_dataRecovery(dataRecovery)