@@ -328,9 +328,11 @@ var runScreenSaverOnDisplay = function(saver, s) {
328
328
windowOpts . fullscreen = true ;
329
329
}
330
330
331
- log . info ( "runScreenSaverOnDisplay" ) ;
331
+ log . info ( "runScreenSaverOnDisplay" , s . id , windowOpts ) ;
332
+
332
333
// don't do anything if we don't actually have a screensaver
333
334
if ( typeof ( saver ) === "undefined" || saver === null ) {
335
+ log . info ( "no saver, exiting" ) ;
334
336
return ;
335
337
}
336
338
@@ -341,22 +343,22 @@ var runScreenSaverOnDisplay = function(saver, s) {
341
343
var w = new BrowserWindow ( windowOpts ) ;
342
344
saverWindows . push ( w ) ;
343
345
344
- // log.info("got screenshot back, let's do this");
346
+ log . info ( "got screenshot back, let's do this" , s . id ) ;
345
347
346
348
try {
347
349
// Emitted when the window is closed.
348
350
w . on ( "closed" , function ( ) {
349
351
saverWindows = _ . filter ( saverWindows , function ( w2 ) {
350
352
return ( w2 !== w ) ;
351
353
} ) ;
352
- log . info ( "running windows: " + saverWindows . length ) ;
354
+ log . info ( "running windows: " + saverWindows . length + " closed: " + s . id ) ;
353
355
354
356
forceWindowClose ( w ) ;
355
357
} ) ;
356
358
357
359
// inject our custom JS and CSS into the screensaver window
358
360
w . webContents . on ( "did-finish-load" , function ( ) {
359
- // log.info("did-finish-load");
361
+ log . info ( "did-finish-load" , s . id ) ;
360
362
if ( ! w . isDestroyed ( ) ) {
361
363
w . webContents . insertCSS ( globalCSSCode ) ;
362
364
}
@@ -374,16 +376,12 @@ var runScreenSaverOnDisplay = function(saver, s) {
374
376
w . once ( "ready-to-show" , ( ) => {
375
377
var diff ;
376
378
377
- // log.info("ready-to-show");
379
+ log . info ( "ready-to-show" , s . id ) ;
378
380
if ( debugMode !== true ) {
379
381
w . setFullScreen ( true ) ;
380
382
}
381
383
382
- if ( process . platform !== "darwin" ) {
383
- w . show ( ) ;
384
- }
385
-
386
- //w.minimize();
384
+ w . show ( ) ;
387
385
w . focus ( ) ;
388
386
389
387
diff = process . hrtime ( tickCount ) ;
@@ -401,7 +399,7 @@ var runScreenSaverOnDisplay = function(saver, s) {
401
399
402
400
url = saver . getUrl ( url_opts ) ;
403
401
404
- log . info ( "Loading " + url ) ;
402
+ log . info ( "Loading " + url , s . id ) ;
405
403
406
404
if ( debugMode === true ) {
407
405
w . webContents . openDevTools ( ) ;
0 commit comments