Conversation
This reverts commit 7d0de8b.
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b575269972
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| if (isStartupComplete && (DateTime.Now - lastHeartbeat).TotalSeconds > 10) | ||
| { |
There was a problem hiding this comment.
Keep startup grace period before watchdog restarts
This restart condition now triggers immediately after isStartupComplete once heartbeat lag exceeds 10s, but the previous guard that skipped watchdog restarts during the first 2 minutes after process start was removed. On slower machines or heavy startup paths, lastHeartbeat can still be stale when startup just finished, so this can cause false-positive “main thread unresponsive” restarts and restart loops right after launch. Please restore the startup grace check (or equivalent) before applying the 10s heartbeat rule.
Useful? React with 👍 / 👎.
Motivation
bbe262df7e0fdd766658c4b90fbbbcb1fbff6d82and7d0de8b5a3728825e1fc8dc6fb84c649725417dfto restore the previous, stable behavior.Description
work: revert ofbbe262df7e0fdd766658c4b90fbbbcb1fbff6d82(recorded asfc4415b) and revert of7d0de8b5a3728825e1fc8dc6fb84c649725417df(recorded as938cce1).Ink Canvas/App.xaml.csby removing conflict markers and keeping theDateTime.Now-based watchdog checks and the inline startup timeout check (elapsedSinceStart.TotalMinutes >= 2).Ink Canvas/Helpers/PPTManager.csand introducingUpdateCurrentPresentationInfo()to centralize and harden retrieval of current presentation/slide state and COM cleanup.Ink Canvas/App.xaml.csandInk Canvas/Helpers/PPTManager.cs(revert commits updated those files and removed leftover conflict markers).Testing
git status --shortand confirmed working tree is clean and no uncommitted changes remain (success).git log --oneline -n 5to confirm the two revert commits are present onwork(success).git show --stat --name-onlyand validated thatInk Canvas/App.xaml.csandInk Canvas/Helpers/PPTManager.csreflect the intended revert changes (success).rg -n "^(<<<<<<<|=======|>>>>>>>)"in the modified files and confirmed none remain (success).Codex Task