Skip to content

Commit 9715a17

Browse files
committed
plasmac: fix manual cut abort state
1 parent ff1116f commit 9715a17

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5940,8 +5940,9 @@ def on_keycall_F12(self, event, state, shift, cntrl):
59405940
self.STYLEEDITOR.load_dialog()
59415941

59425942
def on_keycall_F9(self, event, state, shift, cntrl):
5943-
if self.key_is_valid(event, state) and self.w.main_tab_widget.currentIndex() == self.MAIN \
5944-
and not self.probeTest and not self.torchPulse and not self.framing and STATUS.is_interp_idle():
5943+
if self.key_is_valid(event, state) and self.w.main_tab_widget.currentIndex() == self.MAIN and \
5944+
not self.probeTest and not self.torchPulse and not self.framing and \
5945+
(STATUS.is_interp_idle() or (self.manualCut and STATUS.is_interp_paused())):
59455946
self.manual_cut()
59465947

59475948
def on_keycall_XPOS(self, event, state, shift, cntrl):

src/hal/components/plasmac.comp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ FUNCTION(_) {
721721
if(tool == EMPTY){
722722
manual_cut = FALSE;
723723
torch_on = FALSE;
724-
stop_type = STOP;
724+
stop_type = NONE;
725725
program_stop = TRUE;
726726
cut_started = FALSE;
727727
probe_required = TRUE;

0 commit comments

Comments
 (0)