Skip to content

Fix crashes during document loading and improve error handling #12

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.

Sign up for GitHub

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
JaviLendi merged 3 commits into from
May 21, 2026
Merged

Fix crashes during document loading and improve error handling #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
032a973
fix crash when user closes window during slow initial document load
kjk May 20, 2026
fcf280b
Fix crash with dangling tab->ctrl during rapid document loading
kjk May 20, 2026
0d76ecf
Resolve merge conflicts: integrate upstream crash fixes
JaviLendi May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/SumatraPDF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,6 +2314,7 @@ extern void SetTabState(WindowTab* tab, TabState* state);

// Call SaveSettings asynchronously to avoid running it in the middle of
// document/tab transitions during document load completion.
// Fixes crashes with dangling tab->ctrl under rapid DDE opens + hooks.
static void SaveSettingsVoid() {
SaveSettings();
}
Expand Down Expand Up @@ -2354,6 +2355,10 @@ MainWindow* LoadDocumentFinish(LoadArgs* args) {
tab->SetFilePath(fullPath);
win->currentTabTemp = AddTabToWindow(win, tab);

if (!IsMainWindowValid(win) || win->isBeingClosed) {
return nullptr;
}

// logf("LoadDocument: !forceReuse, created win->CurrentTab() at 0x%p\n", win->CurrentTab());
} else {
win->CurrentTab()->SetFilePath(fullPath);
Expand Down Expand Up @@ -2389,6 +2394,10 @@ MainWindow* LoadDocumentFinish(LoadArgs* args) {
}
}

if (!IsMainWindowValid(win) || win->isBeingClosed) {
return nullptr;
}

if (gPluginMode) {
// hide the menu for embedded documents opened from the plugin
SetMenu(win->hwndFrame, nullptr);
Expand Down
Loading