yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

Fix showing error msg

Browse Source
This commit is contained in:
Michal Horejsek
2020-08-21 10:01:45 +02:00
parent 40aeb6c010
commit 8592a264c0
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/frontend/qml/GuiIE.qml
View File

@ -137,8 +137,9 @@ Item {
}
onNotifyError : {
var name = go.errorDescription.slice(0, go.errorDescription.indexOf("\n"))
var errorMessage = go.errorDescription.slice(go.errorDescription.indexOf("\n"))
var sep = go.errorDescription.indexOf("\n") < 0 ? go.errorDescription.length : go.errorDescription.indexOf("\n")
var name = go.errorDescription.slice(0, sep)
var errorMessage = go.errorDescription.slice(sep)
switch (errCode) {
case gui.enums.errPMLoadFailed :
winMain.popupMessage.show ( qsTr ( "Loading ProtonMail folders and labels was not successful." , "Error message" ) )

1
internal/frontend/qt-ie/frontend.go
View File

@ -474,6 +474,7 @@ func (f *FrontendQt) createLabelOrFolder(email, name, color string, isLabel bool
m, err := f.transfer.CreateTargetMailbox(m)
if err != nil {
log.Errorln("Folder/Label creating:", err)
err = errors.New(name + "\n" + err.Error()) // GUI splits by \n.
if isLabel {
f.showError(errCreateLabelFailed, err)
} else {