3 files changed, 7 insertions, 11 deletions
diff --git a/pkg/backend/actions.go b/pkg/backend/actions.go
index 725a550..ca45347 100644
--- a/pkg/backend/actions.go
+++ b/pkg/backend/actions.go
@@ -19,3 +19,7 @@ func stopVPN() {
 		log.Println(err)
 	}
 }
+
+func closeVPN() {
+	ctx.bm.Close()
+}
diff --git a/pkg/backend/api.go b/pkg/backend/api.go
index cf9ec5c..58e0a42 100644
--- a/pkg/backend/api.go
+++ b/pkg/backend/api.go
@@ -30,10 +30,11 @@ func Unblock() {
 func Quit() {
 	if ctx.Status != off {
 		go setStatus(stopping)
+		ctx.cfg.SetUserStoppedVPN(false)
+	} else {
 		ctx.cfg.SetUserStoppedVPN(true)
-		stopVPN()
 	}
-	cleanup()
+	closeVPN()
 }
 
 func DonateAccepted() {
diff --git a/pkg/backend/cleanup.go b/pkg/backend/cleanup.go
deleted file mode 100644
index 16f36e4..0000000
--- a/pkg/backend/cleanup.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package backend
-
-import (
-	"0xacab.org/leap/bitmask-vpn/pkg/vpn"
-)
-
-func cleanup() {
-	vpn.Cleanup()
-}