-
Notifications
You must be signed in to change notification settings - Fork 7
🐛 Improve cleanup process in closeEvent to ensure proper resource release and thread management #106
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
🐛 Improve cleanup process in closeEvent to ensure proper resource release and thread management #106
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -58,7 +58,6 @@ | |||||
| import pyqtconsole.highlighter as hl | ||||||
|
|
||||||
|
|
||||||
|
|
||||||
| class SetRobotModelDialog(QtWidgets.QDialog): | ||||||
| def __init__(self, meshcat_provider, parent=None, dataset_loaded=False): | ||||||
| # call QMainWindow constructor | ||||||
|
|
@@ -599,22 +598,53 @@ def update_index(self): | |||||
| ) | ||||||
|
|
||||||
| def closeEvent(self, event): | ||||||
| # close the window | ||||||
| self.pyconsole.close() | ||||||
| for video_item in self.video_items: | ||||||
| del video_item.media_player | ||||||
| # ensure update callbacks are not triggered while tearing down the UI | ||||||
| if self.signal_provider is not None: | ||||||
| try: | ||||||
| self.signal_provider.update_index_signal.disconnect(self.update_index) | ||||||
| except (TypeError, RuntimeError): | ||||||
| # ignore if already disconnected | ||||||
| pass | ||||||
|
|
||||||
| # stop timers/animations before widgets disappear | ||||||
| for plot_item in self.plot_items: | ||||||
| plot_item.canvas.quit_animation() | ||||||
|
|
||||||
| self.meshcat_provider.state = PeriodicThreadState.closed | ||||||
| self.meshcat_provider.wait() | ||||||
| # stop the embedded Python console (it owns a QThread) | ||||||
| self.pyconsole.close() | ||||||
|
|
||||||
| # gracefully stop worker threads before deleting widgets they use | ||||||
| if self.signal_provider is not None: | ||||||
| self.signal_provider.state = PeriodicThreadState.closed | ||||||
| self.signal_provider.wait() | ||||||
| self.signal_provider = None | ||||||
|
|
||||||
| event.accept() | ||||||
| # Stop the meshcat_provider if exists | ||||||
| if self.meshcat_provider is not None: | ||||||
| self.meshcat_provider.state = PeriodicThreadState.closed | ||||||
| self.meshcat_provider.wait() | ||||||
|
|
||||||
| # release multimedia resources explicitly to avoid late callbacks | ||||||
| # while closing | ||||||
| for video_item in self.video_items: | ||||||
| media_player = getattr(video_item, "media_player", None) | ||||||
| if media_player is not None: | ||||||
| if video_item.media_loaded: | ||||||
| media_player.stop() | ||||||
| try: | ||||||
| media_player.setVideoOutput(None) | ||||||
| except Exception: | ||||||
|
||||||
| except Exception: | |
| except (RuntimeError, AttributeError): |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The check for
video_item.media_loadedbefore callingmedia_player.stop()may not be necessary during cleanup. Consider callingstop()unconditionally as it should be safe to call on a stopped player.