Skip to content

Commit 77c18b8

Browse files
authored
Merge pull request #292151 from microsoft/tyriar/291991
Fix Monaco scroll offset buffer use after destroy
2 parents 084facb + 377e7d2 commit 77c18b8

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

src/vs/editor/browser/gpu/renderStrategy/fullFileRenderStrategy.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ export class FullFileRenderStrategy extends BaseRenderStrategy {
172172
}
173173

174174
public override onScrollChanged(e?: ViewScrollChangedEvent): boolean {
175+
if (this._store.isDisposed) {
176+
return false;
177+
}
175178
const dpr = getActiveWindow().devicePixelRatio;
176179
this._scrollOffsetValueBuffer[0] = (e?.scrollLeft ?? this._context.viewLayout.getCurrentScrollLeft()) * dpr;
177180
this._scrollOffsetValueBuffer[1] = (e?.scrollTop ?? this._context.viewLayout.getCurrentScrollTop()) * dpr;

src/vs/editor/browser/gpu/renderStrategy/viewportRenderStrategy.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ export class ViewportRenderStrategy extends BaseRenderStrategy {
157157
}
158158

159159
public override onScrollChanged(e?: ViewScrollChangedEvent): boolean {
160+
if (this._store.isDisposed) {
161+
return false;
162+
}
160163
const dpr = getActiveWindow().devicePixelRatio;
161164
this._scrollOffsetValueBuffer[0] = (e?.scrollLeft ?? this._context.viewLayout.getCurrentScrollLeft()) * dpr;
162165
this._scrollOffsetValueBuffer[1] = (e?.scrollTop ?? this._context.viewLayout.getCurrentScrollTop()) * dpr;

0 commit comments

Comments
 (0)