From e44014a1a9b193b1b4861eed4242465bfb649a95 Mon Sep 17 00:00:00 2001 From: kPherox Date: Thu, 21 Mar 2019 16:00:15 +0900 Subject: [PATCH] Don't fire 'itunes' event when 'itunes-np' listener is present Remove `uploadnow` variable as it is no longer needed --- app/js/post/img.js | 1 - app/js/ui/spotify.js | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/js/post/img.js b/app/js/post/img.js index e8ed2984..b0ad3421 100644 --- a/app/js/post/img.js +++ b/app/js/post/img.js @@ -156,7 +156,6 @@ function media(b64, type, no) { Materialize.toast(lang.lang_postimg_aftupload, 1000); $("#imgup").text(""); $("#imgsel").show(); - uploadnow=false; localStorage.removeItem("image"); } } diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index f54f80ac..259c6018 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -63,7 +63,6 @@ function spotifyFlagSave(){ Materialize.toast(lang.lang_spotify_imgno, 3000); } } -var uploadnow=false; function nowplaying(mode){ if(mode=="spotify"){ var start = "https://thedesk.top/now-playing?at="+localStorage.getItem("spotify")+"&rt="+localStorage.getItem("spotify-refresh"); @@ -124,6 +123,10 @@ function nowplaying(mode){ }else if(mode=="itunes"){ var electron = require("electron"); var ipc = electron.ipcRenderer; + if (ipc.listenerCount('itunes-np') > 0) { + return false; + } + ipc.send('itunes', ""); ipc.once('itunes-np', function (event, arg) { console.log(arg); @@ -135,13 +138,11 @@ function nowplaying(mode){ var remote=electron.remote; var platform=remote.process.platform; if(platform=="win32"){ - if(!uploadnow && flag && arg.path){ - uploadnow=true; + if(flag && arg.path){ media(arg.path,"image/png","new"); } }else if(platform=="darwin"){ - if(!uploadnow && flag && arg.artworks[0]){ - uploadnow=true; + if(flag && arg.artworks[0]){ ipc.send('bmp-image', [arg.artworks[0].path,0]); } }