Skip to content

Commit 736d5e2

Browse files
authored
Update mainAppWindow.py
- ask before stopping capture - bug correction when cancelling open file
1 parent 29a2df7 commit 736d5e2

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

IPRadar2/mainAppWindow.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,9 @@ def on_cbStayOnTop_clicked(self):
430430
@pyqtSlot()
431431
def on_pbLiveCapture_clicked(self):
432432
if self.pbLiveCapture.text() == "exit":
433-
self.pbLiveCapture.setEnabled(False)
434-
self.close()
433+
if hf.show_popup_question("Stop capture and exit?") == QMessageBox.Yes:
434+
self.pbLiveCapture.setEnabled(False)
435+
self.close()
435436
else:
436437
self.pbOpenFile.setEnabled(False)
437438
self.comboBoxInterface.setEnabled(False)
@@ -446,7 +447,8 @@ def on_pbLiveCapture_clicked(self):
446447
@pyqtSlot()
447448
def on_pbOpenFile_clicked(self):
448449
if self.pbOpenFile.text() == "exit":
449-
self.close()
450+
if hf.show_popup_question("Close file(s) and exit?") == QMessageBox.Yes:
451+
self.close()
450452
else:
451453
self.pbLiveCapture.setEnabled(False)
452454
self.pbOpenFile.setEnabled(False)
@@ -465,10 +467,12 @@ def on_pbOpenFile_clicked(self):
465467
self.pbOpenFile.setEnabled(True)
466468
self.pbOpenFile.setText("open file")
467469
else:
468-
self.pbLiveCapture.setEnabled(True)
470+
if self.fpath == '/':
471+
self.pbLiveCapture.setEnabled(True)
469472
self.pbOpenFile.setEnabled(True)
470473
else:
471-
self.pbLiveCapture.setEnabled(True)
474+
if self.fpath == '/':
475+
self.pbLiveCapture.setEnabled(True)
472476
self.pbOpenFile.setEnabled(True)
473477

474478
@pyqtSlot()

0 commit comments

Comments
 (0)