diff --git a/app/index.html b/app/index.html
index b20d1ba..b7456e1 100644
--- a/app/index.html
+++ b/app/index.html
@@ -529,6 +529,11 @@
const METRICS_EVERY_MS = 2000;
// the game says when it is drawn; if it never does, show it anyway.
const LOADING_AT_MOST_MS = 25000;
+ // a game not drawn this long after it started, with the graphics card
+ // in use, is taken for one the card keeps from drawing (main.js
+ // gpuFallback): the client starts again without it.
+ const GPU_WATCH_MS = 60000;
+ let gpuWatch = null;
let info = null;
let session = null; // {server, flashVars, since} while the game is open
@@ -1089,6 +1094,7 @@
};
const closeGame = message => {
+ clearTimeout(gpuWatch);
window.client.presence(null);
$("fps").textContent = "";
if (webview) {
@@ -1272,6 +1278,7 @@
$("fps").textContent = `· ${Number(event.args[0]) || 0} fps`;
}
if (event.channel === "initialized") {
+ clearTimeout(gpuWatch);
gameIsDrawn();
}
else if (event.channel === "reloadGame") {
@@ -1316,6 +1323,13 @@
$("loading").hidden = false;
clearTimeout(loadingTimer);
loadingTimer = setTimeout(gameIsDrawn, LOADING_AT_MOST_MS);
+ clearTimeout(gpuWatch);
+ if (info && info.gpu) {
+ gpuWatch = setTimeout(() => {
+ closeGame("The game did not start with the graphics card. Burrow is restarting without it (Use GPU, under Advanced, turns it back on).");
+ setTimeout(() => window.client.gpuFallback(), 4000);
+ }, GPU_WATCH_MS);
+ }
$("stage").prepend(webview);
$("who").textContent = `${session.flashVars.username} · ${new URL(session.server).host}`;
$("stats-tip").textContent = fieldValue("account-type") === "4"
diff --git a/app/main.js b/app/main.js
index 633575f..6219ea6 100644
--- a/app/main.js
+++ b/app/main.js
@@ -211,6 +211,17 @@ let updateState = null; // the last thing the updater said, for a page loaded af
ipcMain.handle("setGpu", (event, on) => {
fs.writeFileSync(SETTINGS_FILE, JSON.stringify({...readSettings(), gpu: on === true}));
});
+// some graphics cards (or their drivers) leave the game on its loading
+// screen for good; players got past it by turning "Use GPU" off. the page
+// asks for that itself when the game has not drawn in time (index.html).
+ipcMain.on("gpuFallback", () => {
+ if (!usesGpu || app.commandLine.hasSwitch("aj-gpu")) {
+ return;
+ }
+ fs.writeFileSync(SETTINGS_FILE, JSON.stringify({...readSettings(), gpu: false}));
+ app.relaunch();
+ app.exit(0);
+});
// what the server is told about this computer at sign-in (device.js).
ipcMain.handle("device", () => device.device());
diff --git a/app/preload.js b/app/preload.js
index 7e0ff75..754bcd0 100644
--- a/app/preload.js
+++ b/app/preload.js
@@ -13,6 +13,9 @@ contextBridge.exposeInMainWorld("client", {
// the server's captcha ("login" or "signup") in a window of its own: its answer, or "" when there is none.
captcha: (serverUrl, action) => ipcRenderer.invoke("captcha", serverUrl, action),
setGpu: on => ipcRenderer.invoke("setGpu", on),
+ // the game did not start drawing with the graphics card: it is turned off
+ // (as "Use GPU" would) and the client starts again.
+ gpuFallback: () => ipcRenderer.send("gpuFallback"),
setAutoUpdate: on => ipcRenderer.invoke("setAutoUpdate", on),
restartToUpdate: () => ipcRenderer.send("restartToUpdate"),
// {state: "ready" | "download", version} from updater.js