Fix: Next episode prompt fr fr frrrrr

Author: Wraient

internal/curd.go

@@ -1365,7 +1365,7 @@ func NextEpisodePrompt(userCurdConfig *CurdConfig) {
 	// Create options for the selection
 	options := []SelectionOption{
 		{Key: "yes", Label: "Yes, start next episode"},
-		// "no":  "No, quit",
+		// {Key: "-1", Label:  "No, quit"},
 	}
 
 	// Use DynamicSelect for both CLI and Rofi modes
@@ -1375,6 +1375,8 @@ func NextEpisodePrompt(userCurdConfig *CurdConfig) {
 		ExitCurd(err)
 	}
 
+	Log(fmt.Sprintf("User Selected Key: '%s', Label: '%s'", selectedOption.Key, selectedOption.Label))
+
 	if selectedOption.Key == "-1" {
 		// User selected to quit
 		fmt.Print("\r\033[K") // Carriage return and clear line
@@ -1384,6 +1386,16 @@ func NextEpisodePrompt(userCurdConfig *CurdConfig) {
 		return
 	}
 
+	if selectedOption.Key != "yes" {
+		// User selected something other than yes (shouldn't happen, but safety check)
+		Log(fmt.Sprintf("Unexpected selection key: %s", selectedOption.Key))
+		fmt.Print("\r\033[K") // Carriage return and clear line
+		ExitMPV(anime.Ep.Player.SocketPath)
+		CurdOut("Exiting without starting next episode")
+		ExitCurd(nil)
+		return
+	}
+
 	// If yes, start the next episode
 	prevEpisode := anime.Ep.Number
 	anime.Ep.Number++

internal/selection_menu.go

@@ -81,9 +81,8 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.KeyMsg:
 		switch msg.String() {
 		case "ctrl+c":
-			// Return quit selection option instead of quitting the program
-			m.filteredKeys[m.selected] = SelectionOption{"quit", "-1"}
-			return m, tea.Quit // Properly exit the program
+			// Return quit selection option directly
+			return m, tea.Quit
 		case "backspace":
 			if len(m.filter) > 0 {
 				m.filter = m.filter[:len(m.filter)-1]
@@ -463,6 +462,11 @@ func DynamicSelect(options []SelectionOption) (SelectionOption, error) {
 		return SelectionOption{}, fmt.Errorf("unexpected model type")
 	}
 
+	// Check if the program was quit with Ctrl+C
+	if err != nil {
+		return SelectionOption{Key: "-1", Label: "Quit"}, nil
+	}
+
 	if finalSelectionModel.selected < len(finalSelectionModel.filteredKeys) {
 		return finalSelectionModel.filteredKeys[finalSelectionModel.selected], nil
 	}