From 01a39a486dcc438baa4fb091ab301a20898a02b1 Mon Sep 17 00:00:00 2001
From: Konstantin Vorobyev <kvorobyev@gmail.com>
Date: Wed, 20 Jun 2018 19:32:19 +0200
Subject: [PATCH] Review feedback

---
 application.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/application.go b/application.go
index 2df2b74..d3b5f23 100644
--- a/application.go
+++ b/application.go
@@ -41,7 +41,7 @@ type Application struct {
 	// was drawn.
 	afterDraw func(screen tcell.Screen)
 
-	// Used for events loop lock during Suspend()
+	// Halts the event loop during suspended mode
 	suspendMutex sync.Mutex
 }
 
@@ -183,13 +183,14 @@ func (a *Application) Suspend(f func()) bool {
 	a.Lock()
 
 	if a.screen == nil {
-		// Application is already suspended.
+		// Screen has not yet been initialized
 		a.Unlock()
 		return false
 	}
 
 	// Enter suspended mode.
 	a.suspendMutex.Lock()
+	defer a.suspendMutex.Unlock()
 	a.Unlock()
 	a.Stop()
 
@@ -209,12 +210,10 @@ func (a *Application) Suspend(f func()) bool {
 	var err error
 	a.screen, err = tcell.NewScreen()
 	if err != nil {
-		a.suspendMutex.Unlock()
 		a.Unlock()
 		panic(err)
 	}
 	if err = a.screen.Init(); err != nil {
-		a.suspendMutex.Unlock()
 		a.Unlock()
 		panic(err)
 	}
@@ -222,7 +221,6 @@ func (a *Application) Suspend(f func()) bool {
 	a.Draw()
 
 	// Continue application loop.
-	a.suspendMutex.Unlock()
 	return true
 }