qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 15:30:38 +02:00
Code

Don't overwrite link action provided to constructor.

Browse Source 
Fixes bug introduced in 57ad81e3df.
This bug would prevent applications from launching, so it's pretty serious.
I did test before committing, but apparently I didn't test the right binary.
This commit is contained in:
Maarten ter Huurne 2012-04-10 20:30:36 +02:00
parent 92d221a1bd
commit ed8b0c38ba
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/link.cpp
View File

@ -29,14 +29,12 @@
#include <sstream> #include <sstream>
using namespace std; using namespace std;
using namespace fastdelegate;
Link::Link(GMenu2X *gmenu2x_, Touchscreen &ts, LinkRunAction action_) Link::Link(GMenu2X *gmenu2x_, Touchscreen &ts, LinkRunAction action_)
: Button(ts, true) : Button(ts, true)
, action(action_) , action(action_)
, gmenu2x(gmenu2x_) , gmenu2x(gmenu2x_)
{ {
action = MakeDelegate(this, &Link::run);
edited = false; edited = false;
iconPath = gmenu2x->sc.getSkinFilePath("icons/generic.png"); iconPath = gmenu2x->sc.getSkinFilePath("icons/generic.png");
iconX = 0; iconX = 0;