Skip to content
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

Fix resolveSystemProxyFromElectron causing a crash on quit #7379

Merged
merged 3 commits into from
Mar 20, 2023

Conversation

jakolehm
Copy link
Contributor

Fixes #7378

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
@jakolehm jakolehm added this to the 6.4.8 milestone Mar 20, 2023
@jakolehm jakolehm requested a review from a team as a code owner March 20, 2023 12:05
@jakolehm jakolehm requested review from jansav and Iku-turso and removed request for a team March 20, 2023 12:05
import { BrowserWindow } from "electron";

const electronBrowserWindowInjectable = getInjectable({
id: "electron-browser-window",
const resolveSystemProxyWindowInjectable = getInjectable({
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed because we really need a very specific instance (this is not a generic electron BrowserWindow).

return (opts: BrowserWindowConstructorOptions) => {
return new BrowserWindow(opts);
};
return new BrowserWindow({ show: false, paintWhenInitiallyHidden: false });
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

paintWhenInitiallyHidden: false is the actual fix.

@jakolehm jakolehm added the bug Something isn't working label Mar 20, 2023
@Nokel81 Nokel81 merged commit 7ed9925 into master Mar 20, 2023
@Nokel81 Nokel81 deleted the destroy-resolve-system-proxy-window branch March 20, 2023 13:25
gabriel-mirantis pushed a commit that referenced this pull request Mar 21, 2023
* destroy resolve system proxy window on before quit

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* resolve system proxy window: load blank page

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* disable paintWhenInitiallyHidden

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

---------

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Signed-off-by: Gabriel <gaccettola@mirantis.com>
Nokel81 pushed a commit that referenced this pull request Mar 22, 2023
* destroy resolve system proxy window on before quit

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* resolve system proxy window: load blank page

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* disable paintWhenInitiallyHidden

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

---------

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
@Nokel81 Nokel81 mentioned this pull request Mar 22, 2023
Nokel81 added a commit that referenced this pull request Mar 22, 2023
* Fix resolve system proxy error when no windows available (#7375)

* fix resolve system proxy error when no windows available

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* fix electronBrowserWindowInjectable id

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

---------

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>

* Fix resolveSystemProxyFromElectron causing a crash on quit (#7379)

* destroy resolve system proxy window on before quit

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* resolve system proxy window: load blank page

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* disable paintWhenInitiallyHidden

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

---------

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* Release 6.4.8

Signed-off-by: Sebastian Malton <sebastian@malton.name>

---------

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>
Co-authored-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash on quit
2 participants