Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-23 18:36:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1058 Install after chaning channel right away only in case of downgrade

Browse Source
This commit is contained in:
Michal Horejsek
2021-02-23 08:50:18 +01:00
committed by Jakub Cuth
parent 0e5a45671f
commit feeb7179f5
6 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/qt/accounts.go
View File

@ -84,7 +84,7 @@ func (s *FrontendQt) clearCache() {
channel := s.bridge.GetUpdateChannel()
if channel == updater.EarlyChannel {
if err := s.bridge.SetUpdateChannel(updater.StableChannel); err != nil {
if _, err := s.bridge.SetUpdateChannel(updater.StableChannel); err != nil {
s.Qml.NotifyManualUpdateError()
return
}

8
internal/frontend/qt/frontend.go
View File

@ -605,14 +605,16 @@ func (s *FrontendQt) toggleEarlyAccess() {
channel = updater.EarlyChannel
}
err := s.bridge.SetUpdateChannel(channel)
needRestart, err := s.bridge.SetUpdateChannel(channel)
s.Qml.SetIsEarlyAccess(channel == updater.EarlyChannel)
if err != nil {
s.Qml.NotifyManualUpdateError()
return
}
s.restarter.SetToRestart()
s.App.Quit()
if needRestart {
s.restarter.SetToRestart()
s.App.Quit()
}
}
func (s *FrontendQt) toggleAllowProxy() {