fix condition conflict

bootjp · Jul 12, 2020 · 8c05dc6 · 8c05dc6
1 parent 74a2977
commit 8c05dc6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/cli/main.go b/cli/main.go
@@ -68,7 +68,7 @@ func welcomeScreen(a fyne.App, v vrcarjt.AutoRejoin, w fyne.Window) fyne.CanvasO
 
 		widget.NewGroup("Controls",
 			fyne.NewContainerWithLayout(layout.NewGridLayout(2),
-				widget.NewButton("Status: Start", func() {
+				widget.NewButton("Start", func() {
 					if v.IsRun() {
 						return
 					}

diff --git a/vrc_auto_rejoin_tool.go b/vrc_auto_rejoin_tool.go
@@ -128,17 +128,19 @@ func (v *VRCAutoRejoinTool) Run() error {
 	ok, err := lock.Try()
 
 	if err != nil || !ok {
+		v.lock.Lock()
+		v.running = false
+		v.lock.Unlock()
 		return ErrDuplicateRun
 	}
 
 	if err = lock.Lock(); err != nil {
+		v.lock.Lock()
+		v.running = false
+		v.lock.Unlock()
 		return err
 	}
 
-	v.lock.Lock()
-	v.running = true
-	v.lock.Unlock()
-
 	defer lock.UnLock()
 	v.setupTimeLocation()
 
@@ -157,6 +159,10 @@ func (v *VRCAutoRejoinTool) Run() error {
 		return err
 	}
 
+	v.lock.Lock()
+	v.running = true
+	v.lock.Unlock()
+
 	v.playAudioFile("start.wav")
 	v.wait.Add(1)