Merge branch '0.6.x'

Conflicts:
	NEWS
	configure.ac
	src/media_library.cpp
	src/playlist_editor.cpp
	src/tags.cpp
This commit is contained in:
Andrzej Rybczak
2014-11-06 19:23:54 +01:00
9 changed files with 71 additions and 25 deletions

View File

@@ -122,7 +122,11 @@ protected:
struct MouseEvent : public BaseAction
{
MouseEvent() : BaseAction(Type::MouseEvent, "mouse_event") { }
MouseEvent() : BaseAction(Type::MouseEvent, "mouse_event")
{
m_old_mouse_event.bstate = 0;
m_mouse_event.bstate = 0;
}
protected:
virtual bool canBeRun() const;