Fixed ineffassign issues

anmil · Feb 27, 2017 · 4739594 · 4739594
1 parent eb69b1c
commit 4739594
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/cmd/qnote/commands/merge_books.go b/cmd/qnote/commands/merge_books.go
@@ -60,6 +60,7 @@ func mergeBooksCmdRun(cmd *cobra.Command, args []string) {
 		exitOnError(err)
 
 		err = idxConn.DeleteBook(book1)
+		exitOnError(err)
 
 		notes, err := dbConn.GetAllBookNotes(book2, sortBy, displayOrder)
 		exitOnError(err)

diff --git a/cmd/shared/utils/editor.go b/cmd/shared/utils/editor.go
@@ -92,6 +92,10 @@ func (e *Editor) Open() error {
 	defer f.Close()
 
 	body, err := ioutil.ReadAll(f)
+	if err != nil {
+		e.open = false
+		return err
+	}
 	e.text = string(body)
 
 	e.open = false