1bfad40 · unity8 · git.iko.soy

on xenial help sign in

indicators: unregister rootactionstate from the menu

1bfad40Lars Uebernickel13 years ago

plugins/Unity/Indicators/rootactionstate.cpp+5

@@ -37,6 +37,10 @@ RootActionState::RootActionState(QObject *parent)

38RootActionState::~RootActionState()

39{

40+ if (m_menu) {

41+ m_menu->disconnect(this);

42+ m_menu->setActionStateParser(NULL);

43+ }

40}

44}

42UnityMenuModel* RootActionState::menu() const

46UnityMenuModel* RootActionState::menu() const

@@ -49,6 +53,7 @@ void RootActionState::setMenu(UnityMenuModel* menu)

49 if (m_menu != menu) {

53 if (m_menu != menu) {

50 if (m_menu) {

54 if (m_menu) {

51 m_menu->disconnect(this);

55 m_menu->disconnect(this);

56+ m_menu->setActionStateParser(NULL);

52 }

57 }

53 m_menu = menu;

58 m_menu = menu;