From 1baef4440ab2be64d1e436c659b6fa557b69e1e0 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:28:04 +0900
Subject: [PATCH] Don't set MediaType if parameters ambiguous (#720)

---
 CHANGELIST.md                            | 1 +
 MPF.Frontend/ViewModels/MainViewModel.cs | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index d2ed971b..fe495216 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -37,6 +37,7 @@
 - Fix CLI help text alignment
 - Bring Check and CLI in parity with param processing
 - Remove now-unncessary names
+- Don't set MediaType if parameters ambiguous
 
 ### 3.2.0 (2024-06-20)
 
diff --git a/MPF.Frontend/ViewModels/MainViewModel.cs b/MPF.Frontend/ViewModels/MainViewModel.cs
index 56de8869..489ce708 100644
--- a/MPF.Frontend/ViewModels/MainViewModel.cs
+++ b/MPF.Frontend/ViewModels/MainViewModel.cs
@@ -1820,8 +1820,11 @@ namespace MPF.Frontend.ViewModels
             if (MediaTypes != null)
             {
                 MediaType? mediaType = _environment.GetMediaType();
-                int mediaTypeIndex = MediaTypes.FindIndex(m => m == mediaType);
-                this.CurrentMediaType = (mediaTypeIndex > -1 ? MediaTypes[mediaTypeIndex] : MediaTypes[0]);
+                if (mediaType != null)
+                {
+                    int mediaTypeIndex = MediaTypes.FindIndex(m => m == mediaType);
+                    this.CurrentMediaType = (mediaTypeIndex > -1 ? MediaTypes[mediaTypeIndex] : MediaTypes[0]);
+                }
             }
 
             // Reenable change handling