Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -r13e65c3d271d503c2e2e2f1f20736652c470f8cc -rb5afbc61af03dd2e84acf8439cb6be1f022a2921 --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision b5afbc61af03dd2e84acf8439cb6be1f022a2921) @@ -53,10 +53,20 @@ else _alarmItem.alarmMaximize() } onAccepted: { - _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Accepted) + if ( vConfirm.isPowerOff ) { + _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Accepted) + } + else { + if ( ! vConfirm.isReject ) vConfirm.doConfirm( true ) + } } onRejected: { - _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Rejected) + if ( vConfirm.isPowerOff ) { + _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Rejected) + } + else { + if ( ! vConfirm.isReject ) vConfirm.doConfirm( false ) + } } }