lib/presentation/views/main_menu/match_view/match_result_view.dart

@@ -50,7 +50,7 @@ class _MatchResultViewState extends State<MatchResultView> {
   @override
   void initState() {
     db = Provider.of<AppDatabase>(context, listen: false);
-    ruleset = widget.match.game.ruleset;
+    ruleset = Ruleset.highestScore; //widget.match.game.ruleset;
     canSave = !rulesetSupportsScoreEntry();
 
     allPlayers = widget.match.players;
@@ -93,16 +93,13 @@ class _MatchResultViewState extends State<MatchResultView> {
     return Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
       appBar: AppBar(
-        automaticallyImplyLeading: !isLiveEditMode,
+        leading: IconButton(
-        leading: !isLiveEditMode
-            ? IconButton(
           icon: const Icon(Icons.close),
           onPressed: () {
             widget.onWinnerChanged?.call();
             Navigator.of(context).pop(_selectedPlayer);
           },
-              )
+        ),
-            : null,
         title: Text(widget.match.name),
       ),
       body: SafeArea(
@@ -212,16 +209,16 @@ class _MatchResultViewState extends State<MatchResultView> {
                       ),
                     ),
             ),
-            if (!isLiveEditMode) ...[
+
             if (rulesetSupportsScoreEntry())
             // Button to switch to live edit mode
             ...[
               CustomWidthButton(
-                  text: loc.live_edit_mode,
+                text: isLiveEditMode ? loc.exit_view : loc.live_edit_mode,
                 sizeRelativeToWidth: 0.95,
                 buttonType: ButtonType.secondary,
                 onPressed: () => setState(() {
-                    isLiveEditMode = true;
+                  isLiveEditMode = !isLiveEditMode;
                 }),
               ),
               const SizedBox(height: 10),
@@ -244,15 +241,6 @@ class _MatchResultViewState extends State<MatchResultView> {
                     }
                   : null,
             ),
-            ] else ...[
-              CustomWidthButton(
-                text: loc.exit_view,
-                sizeRelativeToWidth: 0.95,
-                onPressed: () => setState(() {
-                  isLiveEditMode = false;
-                }),
-              ),
-            ],
           ],
         ),
       ),