Skip to content

Commit 0a53cd1

Browse files
authored
Merge branch 'develop' into renovate/domutils-4.x
2 parents 47f4a42 + b790019 commit 0a53cd1

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

apps/desktop/hak/matrix-seshat/check.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ export default async function (hakEnv: HakEnv, moduleInfo: DependencyInfo): Prom
2727

2828
try {
2929
// node-gyp uses python for reasons beyond comprehension
30-
await hakEnv.checkTools([["python", "--version"]]);
31-
} catch {
32-
// try python3 too
30+
// Try python3 first, to get a more sensible error if python is not found in the fallback
3331
await hakEnv.checkTools([["python3", "--version"]]);
32+
} catch {
33+
await hakEnv.checkTools([["python", "--version"]]);
3434
}
3535

3636
// Ensure Rust target exists (nb. we avoid depending on rustup)

apps/desktop/scripts/hak/hakEnv.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ export default class HakEnv {
103103
shell: this.isWin(),
104104
...options,
105105
});
106+
proc.on("error", (err) => {
107+
reject(err);
108+
});
106109
proc.on("exit", (code) => {
107110
if (code) {
108111
reject(code);

apps/web/src/components/views/elements/EventListSummary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export default class EventListSummary extends React.Component<Props, State> {
174174

175175
private unbindSentinelListeners(events: MatrixEvent[]): void {
176176
for (const event of events) {
177-
event.on(MatrixEventEvent.SentinelUpdated, this.onEventSentinelUpdated);
177+
event.off(MatrixEventEvent.SentinelUpdated, this.onEventSentinelUpdated);
178178
}
179179
}
180180

0 commit comments

Comments
 (0)