From 7119a43742dbcaee3de7342f8b1ed54cb0ae2939 Mon Sep 17 00:00:00 2001 From: Aliyev Doniyor Date: Mon, 6 Aug 2018 22:25:30 +0500 Subject: [PATCH] Clear upgrade subscribed interval after declining --- src/renderer/redux/actions/app.js | 9 ++++++++- src/renderer/redux/selectors/app.js | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/renderer/redux/actions/app.js b/src/renderer/redux/actions/app.js index 5e212e9f9..cce997814 100644 --- a/src/renderer/redux/actions/app.js +++ b/src/renderer/redux/actions/app.js @@ -27,6 +27,7 @@ import { selectUpgradeFilename, selectAutoUpdateDeclined, selectRemoteVersion, + selectUpgradeTimer, } from 'redux/selectors/app'; import { lbrySettings as config } from 'package.json'; @@ -153,7 +154,13 @@ export function doAutoUpdate() { } export function doAutoUpdateDeclined() { - return dispatch => { + return (dispatch, getState) => { + const state = getState(); + + if (selectUpgradeTimer(state)) { + clearInterval(selectUpgradeTimer(state)); + } + dispatch({ type: ACTIONS.AUTO_UPDATE_DECLINED, }); diff --git a/src/renderer/redux/selectors/app.js b/src/renderer/redux/selectors/app.js index 98b97f755..bcce68504 100644 --- a/src/renderer/redux/selectors/app.js +++ b/src/renderer/redux/selectors/app.js @@ -84,3 +84,5 @@ export const selectCurrentLanguage = createSelector( ); export const selectVolume = createSelector(selectState, state => state.volume); + +export const selectUpgradeTimer = createSelector(selectState, state => state.checkUpgradeTimer);