Skip to content

Commit 6779339

Browse files
committed
Add some logging. Update how we open/display saver window
This will hopefully clear up some issues where screensavers weren't consistently loading in OSX.
1 parent 2392571 commit 6779339

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/main/index.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,11 @@ var runScreenSaverOnDisplay = function(saver, s) {
328328
windowOpts.fullscreen = true;
329329
}
330330

331-
log.info("runScreenSaverOnDisplay");
331+
log.info("runScreenSaverOnDisplay", s.id, windowOpts);
332+
332333
// don't do anything if we don't actually have a screensaver
333334
if ( typeof(saver) === "undefined" || saver === null ) {
335+
log.info("no saver, exiting");
334336
return;
335337
}
336338

@@ -341,22 +343,22 @@ var runScreenSaverOnDisplay = function(saver, s) {
341343
var w = new BrowserWindow(windowOpts);
342344
saverWindows.push(w);
343345

344-
//log.info("got screenshot back, let's do this");
346+
log.info("got screenshot back, let's do this", s.id);
345347

346348
try {
347349
// Emitted when the window is closed.
348350
w.on("closed", function() {
349351
saverWindows = _.filter(saverWindows, function(w2) {
350352
return (w2 !== w);
351353
});
352-
log.info("running windows: " + saverWindows.length);
354+
log.info("running windows: " + saverWindows.length + " closed: " + s.id);
353355

354356
forceWindowClose(w);
355357
});
356358

357359
// inject our custom JS and CSS into the screensaver window
358360
w.webContents.on("did-finish-load", function() {
359-
//log.info("did-finish-load");
361+
log.info("did-finish-load", s.id);
360362
if (!w.isDestroyed()) {
361363
w.webContents.insertCSS(globalCSSCode);
362364
}
@@ -374,16 +376,12 @@ var runScreenSaverOnDisplay = function(saver, s) {
374376
w.once("ready-to-show", () => {
375377
var diff;
376378

377-
//log.info("ready-to-show");
379+
log.info("ready-to-show", s.id);
378380
if ( debugMode !== true ) {
379381
w.setFullScreen(true);
380382
}
381383

382-
if (process.platform !== "darwin") {
383-
w.show();
384-
}
385-
386-
//w.minimize();
384+
w.show();
387385
w.focus();
388386

389387
diff = process.hrtime(tickCount);
@@ -401,7 +399,7 @@ var runScreenSaverOnDisplay = function(saver, s) {
401399

402400
url = saver.getUrl(url_opts);
403401

404-
log.info("Loading " + url);
402+
log.info("Loading " + url, s.id);
405403

406404
if ( debugMode === true ) {
407405
w.webContents.openDevTools();

0 commit comments

Comments
 (0)